darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added mallocs for NULL reallocs

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@932 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Scott Fritzinger
2000-08-20 20:44:29 +00:00
parent fa55af255e
commit d94401582b
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libgphoto2/core.c
View File

@@ -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);

5
libgphoto2/file.c
View File

@@ -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;

13
libgphoto2/settings.c
View File

@@ -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)