fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor new_tempfile()

Browse Source 
Avoid preallocating buffers on the stack, use dynamic memory allocation
instead. Also, change the semantics of new_tempfile() so that it returns
the full name of the temporary file and fix all call sites.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer
2014-07-21 22:56:37 +02:00
parent 21fc7a4b74
commit 66ce00153b
5 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/utils.c
View File

@@ -619,21 +619,16 @@ const char *get_tempdir(void)
* Create a new unique file, and return a newly allocated string which contains
* the random part of the file name.
*/
char *new_tempfile(const char *prefix, int trailing_len)
char *new_tempfile(const char *prefix)
{
char fullname[BUFSIZ];
int prefix_len, fd;
char *fullname;
int fd;
FILE *file;
if (prefix == NULL)
return NULL;
prefix_len = strlen(prefix);
if (prefix_len + trailing_len >= BUFSIZ)
return NULL;
memcpy(fullname, prefix, prefix_len);
memset(fullname + prefix_len, 'X', trailing_len);
fullname[prefix_len + trailing_len] = '\0';
asprintf(&fullname, "%s.XXXXXX", prefix);
if ((fd = mkstemp(fullname)) == -1
|| (file = fdopen(fd, "w+")) == NULL) {
if (fd != -1) {
@@ -642,11 +637,13 @@ char *new_tempfile(const char *prefix, int trailing_len)
}
ERROR_MSG(_("temporary file \"%s\" could not be created"),
fullname);
mem_free(fullname);
return NULL;
}
fclose(file);
return mem_strdup(fullname + prefix_len);
return fullname;
}
/*