cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a double-free in pbmtext, from upstream

Browse Source 
ok naddy
This commit is contained in:
jcs 2020-07-23 16:53:15 +00:00
parent 8f7fbbc18d
commit 57e2f70430
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/netpbm/Makefile
View File

@ -1,7 +1,9 @@
# $OpenBSD: Makefile,v 1.91 2020/07/07 20:15:03 naddy Exp $
# $OpenBSD: Makefile,v 1.92 2020/07/23 16:53:15 jcs Exp $
COMMENT= toolkit for manipulation and conversion of graphic images
REVISION= 0
DISTNAME= netpbm-10.91.00
SHARED_LIBS= netpbm 5.2
CATEGORIES= graphics

26
graphics/netpbm/patches/patch-lib_libpbmfont0_c Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-lib_libpbmfont0_c,v 1.1 2020/07/23 16:53:15 jcs Exp $
Fix a double-free, from upstream
Index: lib/libpbmfont0.c
--- lib/libpbmfont0.c.orig
+++ lib/libpbmfont0.c
@@ -253,9 +253,6 @@ pbm_destroybdffont2_base(struct font2 * const font2P)
free(font2P->glyph);
- if (font2P->selectorP)
- pm_selector_destroy(font2P->selectorP);
-
if (font2P->oldfont)
pbm_freearray(font2P->oldfont, font2P->frows);
@@ -275,7 +272,7 @@ pbm_destroybdffont2(struct font2 * const font2P) {
if (font2P->load_fn != FIXED_DATA) {
destroyGlyphData(font2P->glyph, font2P->maxglyph, font2P->selectorP);
- pbm_destroybdffont2_base(font2P);
+ pbm_destroybdffont2_base(font2P);
}
}