diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-05-09 10:24:18 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-05-09 10:24:18 +0200 |
| commit | 88935f701f51d84ed536cb55cc7b2ba391d7597e (patch) | |
| tree | f88726b42a65d6565014d06c07d9257ed1bb4cd5 /android/console.c | |
| parent | cee98de91c5380efbc321bf01a6025675fbed748 (diff) | |
| download | external_qemu-88935f701f51d84ed536cb55cc7b2ba391d7597e.zip external_qemu-88935f701f51d84ed536cb55cc7b2ba391d7597e.tar.gz external_qemu-88935f701f51d84ed536cb55cc7b2ba391d7597e.tar.bz2 | |
console: Fix 'event send' handling.
This patch fixes two bugs in the implementation of the 'event send'
command:
1/ It prevents a crash when using the '0:0:0' event triple
(note that the equivalent EV_SYNC:0:0 used in testing didn't crash)
2/ If fixes the parser to correctly handle several event triples on
the same line, as in:
event send <type1>:<code1>:<value1> <type2>:<code2>:<value2> ...
Change-Id: I26cb55dd2feb75fda4f50ba0d49c7c8ad8a9dcca
Diffstat (limited to 'android/console.c')
| -rw-r--r-- | android/console.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/android/console.c b/android/console.c index 505d331..daae2d7 100644 --- a/android/console.c +++ b/android/console.c @@ -1854,9 +1854,10 @@ do_event_send( ControlClient client, char* args ) p = args; while (*p) { char* q; + char temp[128]; int type, code, value, ret; - p += strspn( args, " \t" ); /* skip spaces */ + p += strspn( p, " \t" ); /* skip spaces */ if (*p == 0) break; @@ -1865,7 +1866,8 @@ do_event_send( ControlClient client, char* args ) if (q == p) break; - ret = android_event_from_str( p, &type, &code, &value ); + snprintf(temp, sizeof temp, "%.*s", q-p, p); + ret = android_event_from_str( temp, &type, &code, &value ); if (ret < 0) { if (ret == -1) { control_write( client, |