d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Constify opt_f and opt_t and eliminate unneeded copying. This fixes

Browse Source 
memory leaks.

Reported by:	clang static analyzer
MFC after:	2 weeks
This commit is contained in:
Xin LI 2015-08-31 05:57:26 +00:00
parent 3b0fd911fa
commit 670f01434e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/iconv/iconv.c
View File

@ -156,11 +156,11 @@ int
main(int argc, char **argv)
{
FILE *fp;
char *opt_f, *opt_t;
const char *opt_f, *opt_t;
int ch, i, res;
bool opt_c = false, opt_s = false;
opt_f = opt_t = strdup("");
opt_f = opt_t = "";
setlocale(LC_ALL, "");
setprogname(argv[0]);
@ -186,12 +186,12 @@ main(int argc, char **argv)
case 'f':
/* from */
if (optarg != NULL)
opt_f = strdup(optarg);
opt_f = optarg;
break;
case 't':
/* to */
if (optarg != NULL)
opt_t = strdup(optarg);
opt_t = optarg;
break;
default:
usage();