Merge pull request #3161 from masatake/cherry-pick-rootkea-s-work

masatake · web-flow · commit 362fc8b0e7cf · 2021-09-16T19:14:48.000+09:00
Cherry picking changes from #3161
diff --git a/configure.ac b/configure.ac
@@ -350,7 +350,7 @@ AC_PROG_LN_S
 AC_CHECK_PROG(STRIP, strip, strip, :)
 AC_SYS_LARGEFILE
 
-AC_CHECK_PROGS([perl_found], [perl], [yes], [no])
+AC_CHECK_PROG([perl_found], [perl], [yes], [no])
 AM_CONDITIONAL([RUN_OPTLIB2C], [test "${perl_found}" = "yes"])
 AM_CONDITIONAL([RUN_TXT2CSTR], [test "${perl_found}" = "yes"])
 
diff --git a/main/args.c b/main/args.c
@@ -145,8 +145,8 @@ static char* nextFileLine (FILE* const fp)
 					c = ungetc (c, fp);
 			}
 			vStringStripTrailing (vs);
-			result = xMalloc (vStringLength (vs) + 1, char);
 			vStringStripLeading (vs);
+			result = xMalloc (vStringLength (vs) + 1, char);
 			strcpy (result, vStringValue (vs));
 		}
 		vStringDelete (vs);

Original file line number	Diff line number	Diff line change
`@@ -145,8 +145,8 @@ static char* nextFileLine (FILE* const fp)`
`145`	`145`	`c = ungetc (c, fp);`
`146`	`146`	`}`
`147`	`147`	`vStringStripTrailing (vs);`
`148`		`- result = xMalloc (vStringLength (vs) + 1, char);`
`149`	`148`	`vStringStripLeading (vs);`
	`149`	`+ result = xMalloc (vStringLength (vs) + 1, char);`
`150`	`150`	`strcpy (result, vStringValue (vs));`
`151`	`151`	`}`
`152`	`152`	`vStringDelete (vs);`