diff options
| author | Danny Baumann <dannybaumann@web.de> | 2012-09-18 02:38:35 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-09-18 02:38:35 -0400 |
| commit | d6659ad8bb6e201adcacfc76667a722020b51e93 (patch) | |
| tree | 6f0123b0effaeb8f1f5f2305324f1196be27de99 | |
| parent | 2049439b8d407d3912dfa83807d33b194dee3f6f (diff) | |
| parent | f79ef1fb0634095f0d334543d2fb723abbd691d8 (diff) | |
| download | android_dalvik-d6659ad8bb6e201adcacfc76667a722020b51e93.tar.gz android_dalvik-d6659ad8bb6e201adcacfc76667a722020b51e93.tar.bz2 android_dalvik-d6659ad8bb6e201adcacfc76667a722020b51e93.zip | |
Merge "Don't malloc between fork and exec" into gingerbread
| -rw-r--r-- | vm/analysis/DexPrepare.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/analysis/DexPrepare.c b/vm/analysis/DexPrepare.c index c00810c94..1280da41f 100644 --- a/vm/analysis/DexPrepare.c +++ b/vm/analysis/DexPrepare.c @@ -342,7 +342,7 @@ bool dvmOptimizeDexFile(int fd, off_t dexOffset, long dexLength, LOGW("ANDROID_ROOT not set, defaulting to /system\n"); androidRoot = "/system"; } - execFile = malloc(strlen(androidRoot) + strlen(kDexOptBin) + 1); + execFile = alloca(strlen(androidRoot) + strlen(kDexOptBin) + 1); strcpy(execFile, androidRoot); strcat(execFile, kDexOptBin); |