[src/trunk]: src/usr.bin/make make(1): fix access to undefined memory (since ...

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

details:   https://anonhg.NetBSD.org/src/rev/3ca83e82e7b9
branches:  trunk
changeset: 942378:3ca83e82e7b9
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Nov 07 13:21:57 2020 +0000

description:
make(1): fix access to undefined memory (since 1994-03-18)

This bug was added in arch.c 1.6, "Do extended-name archives".

diffstat:

 usr.bin/make/arch.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 2fe6958b1bf1 -r 3ca83e82e7b9 usr.bin/make/arch.c
--- a/usr.bin/make/arch.c       Sat Nov 07 13:17:04 2020 +0000
+++ b/usr.bin/make/arch.c       Sat Nov 07 13:21:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arch.c,v 1.164 2020/11/07 13:17:04 rillig Exp $        */
+/*     $NetBSD: arch.c,v 1.165 2020/11/07 13:21:57 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -125,7 +125,7 @@
 #include "config.h"
 
 /*     "@(#)arch.c     8.2 (Berkeley) 1/2/94"  */
-MAKE_RCSID("$NetBSD: arch.c,v 1.164 2020/11/07 13:17:04 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.165 2020/11/07 13:21:57 rillig Exp $");
 
 typedef struct List ArchList;
 typedef struct ListNode ArchListNode;
@@ -438,8 +438,8 @@
            if (len > AR_MAX_NAME_LEN) {
                len = AR_MAX_NAME_LEN;
                snprintf(copy, sizeof copy, "%s", member);
+               hdr = HashTable_FindValue(&ar->members, copy);
            }
-           hdr = HashTable_FindValue(&ar->members, copy);
            return hdr;
        }
     }