pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-28 13:56:37 +02:00
Code Activity

core: free file pointer in case of memory error in util_file_get_content()

Browse Source
This commit is contained in:
Sébastien Helleu
2016-08-13 14:48:33 +02:00
parent b53e7824f2
commit 3e35df9bce
1 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/wee-util.c
+23 -27
View File
@@ -667,39 +667,35 @@ util_file_get_content (const char *filename)
fp = 0;
f = fopen (filename, "r");
if (f)
if (!f)
goto error;
while (!feof (f))
{
while (!feof (f))
{
buffer2 = (char *) realloc (buffer, (fp + (1024 * sizeof (char))));
if (!buffer2)
{
if (buffer)
free (buffer);
return NULL;
}
buffer = buffer2;
count = fread (&buffer[fp], sizeof(char), 1024, f);
if (count <= 0)
{
free (buffer);
return NULL;
}
fp += count;
}
buffer2 = (char *) realloc (buffer, fp + sizeof (char));
buffer2 = (char *) realloc (buffer, (fp + (1024 * sizeof (char))));
if (!buffer2)
{
if (buffer)
free (buffer);
return NULL;
}
goto error;
buffer = buffer2;
buffer[fp] = '\0';
fclose (f);
count = fread (&buffer[fp], sizeof(char), 1024, f);
if (count <= 0)
goto error;
fp += count;
}
buffer2 = (char *) realloc (buffer, fp + sizeof (char));
if (!buffer2)
goto error;
buffer = buffer2;
buffer[fp] = '\0';
fclose (f);
return buffer;
error:
if (buffer)
free (buffer);
if (f)
fclose(f);
return NULL;
}
/*