summaryrefslogtreecommitdiffstats
path: root/fastboot/fastboot.c
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-10-29 14:29:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-29 14:29:26 -0700
commitf17f55914e18eb176ccc5bb8266b248ece8cb56b (patch)
treeb484ac8d44be0f04f73810c931f970bc955ecc6a /fastboot/fastboot.c
parent0f26808e2c696f8bdcca644e0ddae2af9f753ada (diff)
parent36d44740dd045403ae615b8dd6dac8b9a4e9f5bf (diff)
downloadsystem_core-f17f55914e18eb176ccc5bb8266b248ece8cb56b.zip
system_core-f17f55914e18eb176ccc5bb8266b248ece8cb56b.tar.gz
system_core-f17f55914e18eb176ccc5bb8266b248ece8cb56b.tar.bz2
am 36d44740: Merge "Fix a bunch of small system/core bugs."
* commit '36d44740dd045403ae615b8dd6dac8b9a4e9f5bf': Fix a bunch of small system/core bugs.
Diffstat (limited to 'fastboot/fastboot.c')
-rw-r--r--fastboot/fastboot.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index 70b838f..da2af41 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -449,7 +449,13 @@ static int setup_requirement_line(char *name)
for(n = 0; n < count; n++) {
out[n] = strdup(strip(val[n]));
- if (out[n] == 0) return -1;
+ if (out[n] == 0) {
+ for(size_t i = 0; i < n; ++i) {
+ free((char*) out[i]);
+ }
+ free(out);
+ return -1;
+ }
}
fb_queue_require(prod, name, invert, n, out);