[src/trunk]: src/crypto/external/bsd/netpgp/dist/src/lib Avoid a possible ove...

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e1b626ddf3a9
branches:  trunk
changeset: 754919:e1b626ddf3a9
user:      agc <agc%NetBSD.org@localhost>
date:      Sun May 16 06:21:14 2010 +0000

description:
Avoid a possible overwrite of a value in the (key, value) array, in
the event that a reference to the value is passed to the
netpgp_setvar() function as the new value.  Problem noted, cause
detected, and most of the fix contributed by, Anon Ymous.  Thanks!

diffstat:

 crypto/external/bsd/netpgp/dist/src/lib/netpgp.c |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 4b3461b1453c -r e1b626ddf3a9 crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
--- a/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c  Sun May 16 05:18:35 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c  Sun May 16 06:21:14 2010 +0000
@@ -34,7 +34,7 @@
 
 #if defined(__NetBSD__)
 __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: netpgp.c,v 1.48 2010/05/08 04:17:45 agc Exp $");
+__RCSID("$NetBSD: netpgp.c,v 1.49 2010/05/16 06:21:14 agc Exp $");
 #endif
 
 #include <sys/types.h>
@@ -1274,8 +1274,11 @@
 int
 netpgp_setvar(netpgp_t *netpgp, const char *name, const char *value)
 {
-       int     i;
+       char    *newval;
+       int      i;
 
+       /* protect against the case where 'value' is netpgp->value[i] */
+       newval = netpgp_strdup(value);
        if ((i = findvar(netpgp, name)) < 0) {
                /* add the element to the array */
                if (size_arrays(netpgp, netpgp->size + 15)) {
@@ -1290,11 +1293,12 @@
        }
        /* sanity checks for range of values */
        if (strcmp(name, "hash") == 0 || strcmp(name, "algorithm") == 0) {
-               if (__ops_str_to_hash_alg(value) == OPS_HASH_UNKNOWN) {
+               if (__ops_str_to_hash_alg(newval) == OPS_HASH_UNKNOWN) {
+                       free(newval);
                        return 0;
                }
        }
-       netpgp->value[i] = netpgp_strdup(value);
+       netpgp->value[i] = newval;
        return 1;
 }