head	1.1;
access;
symbols
	pkgsrc-2026Q3:1.1.0.2
	pkgsrc-2026Q3-base:1.1;
locks; strict;
comment	@ * @;


1.1
date	2026.09.12.12.14.40;	author wiz;	state Exp;
branches;
next	;
commitid	47yFsrp5lLUPqkVG;


desc
@@


1.1
log
@autogen: add a couple upstream patches, merged and proposed.

Fix CVE-2025-8746.

Bump PKGREVISION.

From Showta Ishizaki in PR 60680.
@
text
@$NetBSD$

Check whether text_mmap() failed before scanning what it returned.

CVE-2025-8746.  Taken verbatim from the patch on Savannah sr #111319,
which upstream has not committed.

--- autoopts/save.c.orig	2017-09-11 00:00:00.000000000 +0000
+++ autoopts/save.c
@@@@ -492,6 +492,9 @@@@
     size_t const name_len = strlen(opts->pzProgName);
     tmap_info_t  map_info;
     char *       text = text_mmap(fname, PROT_READ|PROT_WRITE, MAP_PRIVATE, &map_info);
+    if (TEXT_MMAP_FAILED_ADDR(text))
+        return;
+
     char *       scan = text;
 
     for (;;) {
@