forks/tftp-hpa-google
1
0
Fork 0
forked from mirrors/tftp-hpa-google
Code Pull requests Releases 1 Activity

Fix double-free error in tftp client.

Browse source
This commit is contained in:
H. Peter Anvin 2006-09-27 15:54:41 -07:00
parent ebeb6a63f3
commit 0b821ec893
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tftp/main.c
View file

@ -304,8 +304,6 @@ main(int argc, char *argv[])
(*c->handler)(pargc, pargv); (*c->handler)(pargc, pargv);
exit(0); exit(0);
} }
if (sigsetjmp(toplevel,1) != 0)
(void)putchar('\n');
#ifdef WITH_READLINE #ifdef WITH_READLINE
#ifdef HAVE_READLINE_HISTORY_H #ifdef HAVE_READLINE_HISTORY_H
@ -313,6 +311,8 @@ main(int argc, char *argv[])
#endif #endif
#endif #endif
if (sigsetjmp(toplevel,1) != 0)
(void)putchar('\n');
command(); command();
return 0; /* Never reached */ return 0; /* Never reached */
@ -336,8 +336,10 @@ getmoreargs(const char *partial, const char *mprompt)
elen = strlen(eline); elen = strlen(eline);
if (line) if (line) {
free(line); free(line);
line = NULL;
}
line = xmalloc(len+elen+1); line = xmalloc(len+elen+1);
strcpy(line, partial); strcpy(line, partial);
strcpy(line+len, eline); strcpy(line+len, eline);
@ -734,8 +736,10 @@ command(void)
for (;;) { for (;;) {
#ifdef WITH_READLINE #ifdef WITH_READLINE
if ( line ) if ( line ) {
free(line); free(line);
line = NULL;
}
line = readline(prompt); line = readline(prompt);
if ( !line ) if ( !line )
exit(0); /* EOF */ exit(0); /* EOF */