From d94401582b2d148f16f8d2f65979b3d755dfd149 Mon Sep 17 00:00:00 2001
From: Scott Fritzinger <scottf@unr.edu>
Date: Sun, 20 Aug 2000 20:44:29 +0000
Subject: [PATCH] added mallocs for NULL reallocs

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@932 67ed7778-7388-44ab-90cf-0a291f65f57c
---
 libgphoto2/core.c     |  8 ++++++--
 libgphoto2/file.c     |  5 ++++-
 libgphoto2/settings.c | 13 ++++---------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/libgphoto2/core.c b/libgphoto2/core.c
index 6709cb4c1..a4388ea5c 100644
--- a/libgphoto2/core.c
+++ b/libgphoto2/core.c
@@ -627,8 +627,12 @@ int gp_abilities_list_dump (CameraAbilitiesList *list)
 
 int gp_abilities_list_append (CameraAbilitiesList *list, CameraAbilities *abilities)
 {
-        list->abilities = (CameraAbilities**)realloc(list->abilities,
-                sizeof(CameraAbilities*)*(list->count+1));
+	if (!list->abilities)
+	        list->abilities = (CameraAbilities**)malloc(
+			sizeof(CameraAbilities*));
+	   else
+	        list->abilities = (CameraAbilities**)realloc(list->abilities,
+	                sizeof(CameraAbilities*)*(list->count+1));
         if (!list->abilities)
                 return (GP_ERROR);
 
diff --git a/libgphoto2/file.c b/libgphoto2/file.c
index 5b987b353..aa338de0a 100644
--- a/libgphoto2/file.c
+++ b/libgphoto2/file.c
@@ -39,7 +39,10 @@ int gp_file_append (CameraFile *file, char *data, int size) {
         if (size < 0)
                 return (GP_ERROR);
 
-        file->data = (char*)realloc(file->data, sizeof(char) * (file->size + size));
+	if (!file->data)
+	        file->data = (char*)malloc(sizeof(char) * (size));
+	   else
+	        file->data = (char*)realloc(file->data, sizeof(char) * (file->size + size));
         memcpy(&file->data[file->size], data, size);
 
         file->bytes_read = size;
diff --git a/libgphoto2/settings.c b/libgphoto2/settings.c
index a9e0cc4b1..ecf0fa62b 100644
--- a/libgphoto2/settings.c
+++ b/libgphoto2/settings.c
@@ -27,7 +27,6 @@ int verify_settings (char *settings_file) {
 			for (x=0; x<strlen(buf); x++)
 				if (buf[x] == '=')
 					equals++;
-printf("checking \"%s\" (%i)\n", buf, equals);
 
 			if (equals < 2) {
 				fclose (f);
@@ -73,18 +72,14 @@ printf("here\n");
 		if (strlen(buf)>2) {
 		     buf[strlen(buf)-1] = '\0';
 		     id = strtok(buf, "=");
-printf("id=%s\n", id);
 		     strcpy(glob_setting[glob_setting_count].id,id);
 		     key = strtok(NULL, "=");
-printf("key=%s\n", key);
 		     strcpy(glob_setting[glob_setting_count].key,key);
 		     value = strtok(NULL, "\0");
-printf("value=%s\n", value);
-
-			if (value)
-				strcpy(glob_setting[glob_setting_count++].value, value);
-			   else
-				strcpy(glob_setting[glob_setting_count++].value, "");
+		     if (value)
+			strcpy(glob_setting[glob_setting_count++].value, value);
+		       else
+			strcpy(glob_setting[glob_setting_count++].value, "");
 		}
 	}
 	if (glob_debug)