[Cvs-cvs] ccvs/src ChangeLog parseinfo.c sanity.sh

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Mark D. Baushke <mdb>   07/06/14 00:18:44

Modified files:
        src            : ChangeLog parseinfo.c sanity.sh 

Log message:
        * parseinfo.c (free_config): Avoid double free of
        config->PrimaryServer and config.
        Avoid double free of 'config' using a gross hack.
        
        * sanity.sh: Correct the GPG installation warning if --valgrind is
        in use.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3513&r2=1.3514
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/parseinfo.c?cvsroot=cvs&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1178&r2=1.1179

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3513
retrieving revision 1.3514
diff -u -b -r1.3513 -r1.3514
--- ChangeLog   13 Jun 2007 01:23:38 -0000      1.3513
+++ ChangeLog   14 Jun 2007 00:18:42 -0000      1.3514
@@ -1,3 +1,12 @@
+2007-06-13  Mark D. Baushke  <address@hidden>
+
+       * parseinfo.c (free_config): Avoid double free of
+       config->PrimaryServer and config.
+       Avoid double free of 'config' using a gross hack.
+
+       * sanity.sh: Correct the GPG installation warning if --valgrind is
+       in use.
+
 2007-06-12  Mark D. Baushke  <address@hidden>
 
        [bug #17083]

Index: parseinfo.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/parseinfo.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- parseinfo.c 30 May 2007 23:20:43 -0000      1.87
+++ parseinfo.c 14 Jun 2007 00:18:43 -0000      1.88
@@ -349,10 +349,12 @@
     if (data->HistorySearchPath) free (data->HistorySearchPath);
     if (data->TmpDir) free(data->TmpDir);
     if (data->UserAdminOptions) free (data->UserAdminOptions);
-    if (data->PrimaryServer) free (data->PrimaryServer);
     if (data->VerifyTemplate) free (data->VerifyTemplate);
     if (data->OpenPGPTextmode) free (data->OpenPGPTextmode);
     if (data->VerifyArgs) dellist (&data->VerifyArgs);
+    /* FIXME - an exit handler is doing a double free of config
+       somehow. Use a hack for now to make it go away. */
+    if (data == config) config = NULL; 
     free (data);
 }
 

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1178
retrieving revision 1.1179
diff -u -b -r1.1178 -r1.1179
--- sanity.sh   11 Jun 2007 15:45:59 -0000      1.1178
+++ sanity.sh   14 Jun 2007 00:18:43 -0000      1.1179
@@ -2027,8 +2027,12 @@
     case " $gpgopts " in
       *" --no-secmem-warning "*)
        echo "WARNING: GPG is installed incorrectly.  This will not" >&2
-       echo "interfere with testing, but you may want to set \`$GPG' to" >&2
-       echo "setuid root to avoid using insecure memory." >&2
+       echo "interfere with testing, but you may want to set" >&2
+       echo "  \`$GPG'" >&2
+       echo "to setuid root to avoid using insecure memory." >&2
+       if $valgrind; then
+           echo "Note: GPG is installed correctly to allow --valgrind 
testing." >&2
+       fi
        echo Adding 'no-secmem-warning' to $HOME/.gnupg/options >>$LOGFILE
        echo no-secmem-warning >$HOME/.gnupg/options
        ;;