Changeset 4613 for trunk/src/target/opkg/libopkg/opkg_cmd.c

Timestamp:

08/27/08 17:32:20 (5 years ago)

Author:

tick

Message:

[opkg] fix opkg crashes if PATH is unset

Thanks for chgros

File:

• trunk/src/target/opkg/libopkg/opkg_cmd.c (modified) (2 diffs)

trunk/src/target/opkg/libopkg/opkg_cmd.c

@@ -313 +313 @@
 {
     opkg_intercept_t ctx;
+    char *oldpath;
     char *newpath;
     int gen;
 
     ctx = malloc (sizeof (*ctx));
-    ctx->oldpath = strdup (getenv ("PATH"));
+    oldpath = getenv ("PATH");
+    if (oldpath) {
+        ctx->oldpath = strdup (oldpath);
+    } else {
+        ctx->oldpath = 0;
+    }
+
 
     sprintf_alloc (&newpath, "%s/opkg/intercept:%s", DATADIR, ctx->oldpath);
@@ -345 +352 @@
     int err = 0;
 
-    setenv ("PATH", ctx->oldpath, 1);
-    free (ctx->oldpath);
+    if (ctx->oldpath) {
+        setenv ("PATH", ctx->oldpath, 1);
+        free (ctx->oldpath);
+    } else {
+        unsetenv("PATH"); 
+    }
 
     dir = opendir (ctx->statedir);