Pretend to allocate/deallocate memory correctly

[yaboot.git] / second / file.c

diff --git a/second/file.c b/second/file.c
index b5763a235f6d5db62ad5fb1b4c92254b89775270..ed70376be542670865c249a52e1086381418acd3 100644 (file)
--- a/second/file.c
+++ b/second/file.c
@@ -78,8 +78,8 @@ parse_device_path(char *imagepath, char *defdevice, int defpart,
 
      if (!imagepath)
          return 0;
-     else
-         ipath = strdup(imagepath);
+     else if (!(ipath = strdup(imagepath))) 
+         return 0;
 
      if (defdevice)
          defdev = strdup(defdevice);
@@ -89,6 +89,8 @@ parse_device_path(char *imagepath, char *defdevice, int defpart,
               if ((ptr = strrchr(defdev, ':')) != NULL)
                    *ptr = 0; /* remove trailing : from defdevice if necessary */
          }
+     } else {
+         return 0;
      }
 
      /* if there is no : then there is no filename or partition.  must
@@ -123,6 +125,7 @@ parse_device_path(char *imagepath, char *defdevice, int defpart,
      } else if (strlen(ipath)) {
           result->file = strdup(ipath);
      } else {
+         free(defdev);
          return 0;
      }
 
@@ -137,7 +140,7 @@ parse_device_path(char *imagepath, char *defdevice, int defpart,
 
      free(ipath);
      if (defdev)
-         free(defdev);
+          free(defdev);
      return 1;
 }