diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-07-29 11:08:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-29 11:08:02 -0700 |
| commit | 42b871f1bfc116d53d1bff9d7497415494b2e0e0 (patch) | |
| tree | 68a2de5b4b9271a9c15f5c46d58cdb0020dad542 /fastboot | |
| parent | 331eb52d611de6bd2e70a2b0bde1f3c3733ce657 (diff) | |
| parent | c37ba1c916d73fbf35c6faba1e252e2916d2d41d (diff) | |
| download | system_core-42b871f1bfc116d53d1bff9d7497415494b2e0e0.zip system_core-42b871f1bfc116d53d1bff9d7497415494b2e0e0.tar.gz system_core-42b871f1bfc116d53d1bff9d7497415494b2e0e0.tar.bz2 | |
am c37ba1c9: Merge "Check fastboot oem command line length"
Merge commit 'c37ba1c916d73fbf35c6faba1e252e2916d2d41d' into gingerbread-plus-aosp
* commit 'c37ba1c916d73fbf35c6faba1e252e2916d2d41d':
Check fastboot oem command line length
Diffstat (limited to 'fastboot')
| -rw-r--r-- | fastboot/engine.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fastboot/engine.c b/fastboot/engine.c index 8ba202c..48073ee 100644 --- a/fastboot/engine.c +++ b/fastboot/engine.c @@ -97,14 +97,20 @@ static Action *queue_action(unsigned op, const char *fmt, ...) { Action *a; va_list ap; + size_t cmdsize; a = calloc(1, sizeof(Action)); if (a == 0) die("out of memory"); va_start(ap, fmt); - vsprintf(a->cmd, fmt, ap); + cmdsize = vsnprintf(a->cmd, sizeof(a->cmd), fmt, ap); va_end(ap); + if (cmdsize >= sizeof(a->cmd)) { + free(a); + die("Command length (%d) exceeds maximum size (%d)", cmdsize, sizeof(a->cmd)); + } + if (action_last) { action_last->next = a; } else { |