CVS commit: pkgsrc/pkgtools/rpm2pkg

["Matthias Scheler" <tron%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tron
Date:           Mon Feb 16 18:26:49 UTC 2026

Modified Files:
        pkgsrc/pkgtools/rpm2pkg: Makefile
        pkgsrc/pkgtools/rpm2pkg/files: fileio-zstd.c

Log Message:
pkgtools/rpm2pkg: Update to version 3.3.1

Fix potential (but unlikely) memory leaks in Zstd decompression code


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 pkgsrc/pkgtools/rpm2pkg/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/pkgtools/rpm2pkg/files/fileio-zstd.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/rpm2pkg/Makefile
diff -u pkgsrc/pkgtools/rpm2pkg/Makefile:1.71 pkgsrc/pkgtools/rpm2pkg/Makefile:1.72
--- pkgsrc/pkgtools/rpm2pkg/Makefile:1.71       Sun Jan 26 17:32:00 2020
+++ pkgsrc/pkgtools/rpm2pkg/Makefile    Mon Feb 16 18:26:48 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.71 2020/01/26 17:32:00 rillig Exp $
+# $NetBSD: Makefile,v 1.72 2026/02/16 18:26:48 tron Exp $
 
-PKGNAME=       rpm2pkg-3.3.0
+PKGNAME=       rpm2pkg-3.3.1
 CATEGORIES=    pkgtools
 NO_CHECKSUM=   yes
 

Index: pkgsrc/pkgtools/rpm2pkg/files/fileio-zstd.c
diff -u pkgsrc/pkgtools/rpm2pkg/files/fileio-zstd.c:1.3 pkgsrc/pkgtools/rpm2pkg/files/fileio-zstd.c:1.4
--- pkgsrc/pkgtools/rpm2pkg/files/fileio-zstd.c:1.3     Sun Dec  1 06:05:44 2019
+++ pkgsrc/pkgtools/rpm2pkg/files/fileio-zstd.c Mon Feb 16 18:26:49 2026
@@ -1,4 +1,4 @@
-/*     $NetBSD: fileio-zstd.c,v 1.3 2019/12/01 06:05:44 rin Exp $      */
+/*     $NetBSD: fileio-zstd.c,v 1.4 2026/02/16 18:26:49 tron Exp $     */
 /*     NetBSD: fileio-bzlib.c,v 1.2 2019/12/01 06:03:58 rin Exp        */
 
 /*-
@@ -111,13 +111,17 @@ FileHandleZstd(int *fd_p)
 
        id->id_Stream = ZSTD_createDStream();
        if (id->id_Stream == NULL ||
-           ZSTD_isError(ZSTD_initDStream(id->id_Stream)))
+           ZSTD_isError(ZSTD_initDStream(id->id_Stream))) {
+               FileHandleClose(fh);
                return NULL;
+       }
 
        id->id_BufSize = ZSTD_DStreamOutSize();
        id->id_Buf = malloc(id->id_BufSize);
-       if (id->id_Buf == NULL)
+       if (id->id_Buf == NULL) {
+               FileHandleClose(fh);
                return NULL;
+       }
 
        return fh;
 }