You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by gb...@apache.org on 2018/09/20 07:18:54 UTC
svn commit: r1841433 - in /spamassassin: branches/3.4/spamc/getopt.c
trunk/spamc/getopt.c
Author: gbechis
Date: Thu Sep 20 07:18:53 2018
New Revision: 1841433
URL: http://svn.apache.org/viewvc?rev=1841433&view=rev
Log:
revert r1838778, fixing a possible use-after-free,
opt can be used later.
bz #7633
Modified:
spamassassin/branches/3.4/spamc/getopt.c
spamassassin/trunk/spamc/getopt.c
Modified: spamassassin/branches/3.4/spamc/getopt.c
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/spamc/getopt.c?rev=1841433&r1=1841432&r2=1841433&view=diff
==============================================================================
--- spamassassin/branches/3.4/spamc/getopt.c (original)
+++ spamassassin/branches/3.4/spamc/getopt.c Thu Sep 20 07:18:53 2018
@@ -274,7 +274,6 @@ spamc_getopt_long(int argc, char * const
} else if(longopts[i].has_arg == optional_argument) {
if(((spamc_optind < argc) && (argv[spamc_optind]) && (argv[spamc_optind][0] != '-')) ||
(opt != NULL)) {
- free(opt);
if(opt != NULL) {
spamc_optarg = opt;
} else {
Modified: spamassassin/trunk/spamc/getopt.c
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamc/getopt.c?rev=1841433&r1=1841432&r2=1841433&view=diff
==============================================================================
--- spamassassin/trunk/spamc/getopt.c (original)
+++ spamassassin/trunk/spamc/getopt.c Thu Sep 20 07:18:53 2018
@@ -274,7 +274,6 @@ spamc_getopt_long(int argc, char * const
} else if(longopts[i].has_arg == optional_argument) {
if(((spamc_optind < argc) && (argv[spamc_optind]) && (argv[spamc_optind][0] != '-')) ||
(opt != NULL)) {
- free(opt);
if(opt != NULL) {
spamc_optarg = opt;
} else {