[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/lib pkg_install: carry over...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6c47b73ff6b6
branches:  trunk
changeset: 438672:6c47b73ff6b6
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Sep 07 23:46:42 2020 +0000

description:
pkg_install: carry over a commit from the src tree

Module Name:    src
Committed By:   christos
Date:           Mon Sep  7 00:36:53 UTC 2020

Modified Files:
        src/external/bsd/pkg_install/dist/lib: plist.c

Log Message:
Avoid strict aliasing issue by using a separate buffer..


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/lib/plist.c

diffstat:

 pkgtools/pkg_install/files/lib/plist.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r d32e9249ab7b -r 6c47b73ff6b6 pkgtools/pkg_install/files/lib/plist.c
--- a/pkgtools/pkg_install/files/lib/plist.c    Mon Sep 07 22:29:07 2020 +0000
+++ b/pkgtools/pkg_install/files/lib/plist.c    Mon Sep 07 23:46:42 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: plist.c,v 1.30 2020/03/01 11:02:04 rillig Exp $        */
+/*     $NetBSD: plist.c,v 1.31 2020/09/07 23:46:42 wiz Exp $   */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: plist.c,v 1.30 2020/03/01 11:02:04 rillig Exp $");
+__RCSID("$NetBSD: plist.c,v 1.31 2020/09/07 23:46:42 wiz Exp $");
 
 /*
  * FreeBSD install - a package for the installation and maintainance
@@ -627,8 +627,10 @@
                                                }
                                                buf[SymlinkHeaderLen + cc] = 0x0;
                                                if (strcmp(buf, p->next->name) != 0) {
-                                                       if ((cc = readlink(&buf[SymlinkHeaderLen], &buf[SymlinkHeaderLen],
-                                                                 sizeof(buf) - SymlinkHeaderLen)) < 0) {
+                                                       char    tmp2[MaxPathSize];
+
+                                                       if ((cc = readlink(&buf[SymlinkHeaderLen], tmp2,
+                                                                 sizeof(tmp2))) < 0) {
                                                                printf("symlink %s is not same as recorded value, %s: %s\n",
                                                                    buf, Force ? "deleting anyway" : "not deleting", tmp);
                                                                if (!Force) {
@@ -636,6 +638,7 @@
                                                                        goto pkgdb_cleanup;
                                                                }
                                                        }
+                                                       memcpy(&buf[SymlinkHeaderLen], tmp2, cc);
                                                        buf[SymlinkHeaderLen + cc] = 0x0;
                                                        if (strcmp(buf, p->next->name) != 0) {
                                                                printf("symlink %s is not same as recorded value, %s: %s\n",