commit e94d48fc15255bda6b230a8054665ceef49afbc0
author David Turner <digit@google.com> Tue Sep 13 03:10:41 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 13 03:10:41 2011 -0700
tree 3c52f9aaf9b96d732eb50292aa85c672069174cd
parent dca64d13258f05ec3385403a99eff7da4773ce24
parent f1f1f5ff5b87d4f754572e0f05398842f0cde059

Merge "Accelerate nand device in virtualization environment"

android/main-emulator.c

diff --git a/android/main-emulator.c b/android/main-emulator.c
index 3252053..a6e95c7 100644
--- a/android/main-emulator.c
+++ b/android/main-emulator.c
@@ -307,12 +307,12 @@
     if (path == NULL || path[0] == '\0') {
         p = bufprint(temp, end, "PATH=%s", prefix);
     } else {
-        p = bufprint(temp, end, "PATH=%s;%s", prefix);
+        p = bufprint(temp, end, "PATH=%s;%s", path, prefix);
     }
     /* Ignore overflow, this will push some paths out of the variable, but
      * so be it. */
     D("Setting %s\n", temp);
-    putenv(temp);
+    putenv(strdup(temp));
 #else
     const char* path = getenv("LD_LIBRARY_PATH");
     if (path != NULL && path[0] != '\0') {