d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Free buf in GetFile().

Browse source 
aprintf() returns a const char *; the assignment to char * caused both
clang and gcc to warn of the dropped const.

Commit 893471a introduced a tiny memory leak, because GetFile()
stopped freeing buf.  The const return type of aprintf() suggests that
the buffer must not be freed.

Now use Malloc() to allocate the buffer and free() to free it.  This
also checks if we are out of memory, because Malloc() does the check
and aprintf() currently doesn't.
This commit is contained in:
George Koehler 2017-11-13 21:34:31 -05:00
parent fbff3a4790
commit 229b80a004
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lang/m2/comp/defmodule.c
View file

@ -17,7 +17,7 @@
#include <em_arith.h>
#include <em_label.h>
#include <stdlib.h>
#include <astring.h>
#include <string.h>
#include "LLlex.h"
#include "Lpars.h"
@ -59,15 +59,24 @@ char*
return "";
}
STATIC
STATIC int
GetFile(name) char* name;
{
/* Try to find a file with basename "name" and extension ".def",
in the directories mentioned in "DEFPATH".
*/
char* buf = aprintf("%s.def", name);
size_t len;
int found;
char *buf;
len = strlen(name);
buf = Malloc(len + 5);
memcpy(buf, name, len);
memcpy(buf + len, ".def", 5);
DEFPATH[0] = WorkingDir;
if (!InsertFile(buf, DEFPATH, &(FileName)))
found = InsertFile(buf, DEFPATH, &(FileName));
free(buf);
if (!found)
{
error("could not find a DEFINITION MODULE for \"%s\"", name);
return 0;