CVS commit: pkgsrc/pkgtools/pkg_install/files/lib

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Dec 12 19:25:19 UTC 2020

Modified Files:
        pkgsrc/pkgtools/pkg_install/files/lib: plist.c

Log Message:
pkg_install: carry over bugfix from src

christos: Don't try to memcpy (size_t)-1 bytes!


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/pkgtools/pkg_install/files/lib/plist.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/pkg_install/files/lib/plist.c
diff -u pkgsrc/pkgtools/pkg_install/files/lib/plist.c:1.31 pkgsrc/pkgtools/pkg_install/files/lib/plist.c:1.32
--- pkgsrc/pkgtools/pkg_install/files/lib/plist.c:1.31  Mon Sep  7 23:46:42 2020
+++ pkgsrc/pkgtools/pkg_install/files/lib/plist.c       Sat Dec 12 19:25:19 2020
@@ -1,4 +1,4 @@
-/*     $NetBSD: plist.c,v 1.31 2020/09/07 23:46:42 wiz Exp $   */
+/*     $NetBSD: plist.c,v 1.32 2020/12/12 19:25:19 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.31 2020/09/07 23:46:42 wiz Exp $");
+__RCSID("$NetBSD: plist.c,v 1.32 2020/12/12 19:25:19 wiz Exp $");
 
 /*
  * FreeBSD install - a package for the installation and maintainance
@@ -637,15 +637,16 @@ delete_package(Boolean ign_err, package_
                                                                        fail = FAIL;
                                                                        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",
-                                                                   buf, Force ? "deleting anyway" : "not deleting", tmp);
-                                                               if (!Force) {
-                                                                       fail = FAIL;
-                                                                       goto pkgdb_cleanup;
+                                                       } else {
+                                                               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",
+                                                                           buf, Force ? "deleting anyway" : "not deleting", tmp);
+                                                                       if (!Force) {
+                                                                               fail = FAIL;
+                                                                               goto pkgdb_cleanup;
+                                                                       }
                                                                }
                                                        }
                                                }