netpbm: update to 10.82.00.
This commit is contained in:
parent
d468f6acbf
commit
77fb0381dd
2 changed files with 5 additions and 49 deletions
|
@ -885,26 +885,6 @@ diff -up netpbm-10.58.01/editor/pnmpad.c.security-code netpbm-10.58.01/editor/pn
|
|||
newcols = cols + lpad + rpad;
|
||||
|
||||
if (PNM_FORMAT_TYPE(format) == PBM_TYPE)
|
||||
diff -up netpbm-10.58.01/editor/pnmremap.c.security-code netpbm-10.58.01/editor/pnmremap.c
|
||||
--- netpbm-10.58.01/editor/pnmremap.c.security-code 2012-04-09 15:31:33.000000000 +0200
|
||||
+++ netpbm-10.58.01/editor/pnmremap.c 2012-04-09 15:40:03.222619551 +0200
|
||||
@@ -409,7 +409,7 @@ initFserr(struct pam * const pamP,
|
||||
unsigned int plane;
|
||||
|
||||
unsigned int const fserrSize = pamP->width + 2;
|
||||
-
|
||||
+ overflow_add(pamP->width, 2);
|
||||
fserrP->width = pamP->width;
|
||||
|
||||
MALLOCARRAY(fserrP->thiserr, pamP->depth);
|
||||
@@ -445,6 +445,7 @@ floydInitRow(struct pam * const pamP, st
|
||||
|
||||
int col;
|
||||
|
||||
+ overflow_add(pamP->width, 2);
|
||||
for (col = 0; col < pamP->width + 2; ++col) {
|
||||
unsigned int plane;
|
||||
for (plane = 0; plane < pamP->depth; ++plane)
|
||||
diff -up netpbm-10.58.01/editor/pnmscalefixed.c.security-code netpbm-10.58.01/editor/pnmscalefixed.c
|
||||
--- netpbm-10.58.01/editor/pnmscalefixed.c.security-code 2012-04-09 15:31:34.000000000 +0200
|
||||
+++ netpbm-10.58.01/editor/pnmscalefixed.c 2012-04-09 15:40:03.223619538 +0200
|
||||
|
@ -986,30 +966,6 @@ diff -up netpbm-10.58.01/editor/specialty/pamoil.c.security-code netpbm-10.58.01
|
|||
MALLOCARRAY(hist, inpam.maxval + 1);
|
||||
if (hist == NULL)
|
||||
pm_error("Unable to allocate memory for histogram.");
|
||||
diff -up netpbm-10.58.01/generator/pbmtext.c.security-code netpbm-10.58.01/generator/pbmtext.c
|
||||
--- netpbm-10.58.01/generator/pbmtext.c.security-code 2012-04-09 15:31:34.000000000 +0200
|
||||
+++ netpbm-10.58.01/generator/pbmtext.c 2012-04-09 15:40:03.225619514 +0200
|
||||
@@ -712,6 +714,7 @@ getText(const char cmdline_text
|
||||
pm_error("A line of input text is longer than %u characters."
|
||||
"Cannot process.", (unsigned)sizeof(buf)-1);
|
||||
if (lineCount >= maxlines) {
|
||||
+ overflow2(maxlines, 2);
|
||||
maxlines *= 2;
|
||||
REALLOCARRAY(text_array, maxlines);
|
||||
if (text_array == NULL)
|
||||
diff -up netpbm-10.58.01/lib/libpam.c.security-code netpbm-10.58.01/lib/libpam.c
|
||||
--- netpbm-10.58.01/lib/libpam.c.security-code 2012-04-09 15:31:38.000000000 +0200
|
||||
+++ netpbm-10.58.01/lib/libpam.c 2012-04-09 15:40:03.227619490 +0200
|
||||
@@ -220,7 +220,8 @@ allocPamRow(const struct pam * const pam
|
||||
unsigned int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample);
|
||||
tuple * tuplerow;
|
||||
|
||||
- tuplerow = malloc(pamP->width * (sizeof(tuple *) + bytesPerTuple));
|
||||
+ overflow_add(sizeof(tuple *), bytesPerTuple);
|
||||
+ tuplerow = malloc2(pamP->width, (sizeof(tuple *) + bytesPerTuple));
|
||||
|
||||
if (tuplerow != NULL) {
|
||||
/* Now we initialize the pointers to the individual tuples
|
||||
diff -up netpbm-10.58.01/lib/libpammap.c.security-code netpbm-10.58.01/lib/libpammap.c
|
||||
--- netpbm-10.58.01/lib/libpammap.c.security-code 2012-04-09 15:31:38.000000000 +0200
|
||||
+++ netpbm-10.58.01/lib/libpammap.c 2012-04-09 15:40:03.228619477 +0200
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
# Template file for 'netpbm'
|
||||
pkgname=netpbm
|
||||
# from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
|
||||
version=10.81.03
|
||||
version=10.82.00
|
||||
revision=1
|
||||
_githash=3642751efdc205fb08bcc4f5c4d5879fc6077a72
|
||||
_githash_guide=d07fb0a8b5d8fd9aa3ca6aa53694400cda4ba425
|
||||
_githash=cd86a2c8d798c98b2f5d7656971fc4553b4ed172
|
||||
_githash_guide=08a792751573eb86bcf39c7a4ffed2f14972128c
|
||||
create_wrksrc=yes
|
||||
build_wrksrc="netpbm-mirror-${_githash}"
|
||||
hostmakedepends="pkg-config perl python flex"
|
||||
|
@ -17,8 +17,8 @@ homepage="http://netpbm.sourceforge.net/"
|
|||
nocross=yes
|
||||
distfiles="https://github.com/chneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
|
||||
https://github.com/chneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
|
||||
checksum="6ac24053b69d2c875813d08f5cda60cf2cc733af0b237c94c741a9efbf01e0df
|
||||
0f6aa04f897556a9ddd0fc39f0e741ade6b9951799809ff9b267e788f023f97c"
|
||||
checksum="b410af2d8d59263120378ef3e3641e48cfc78f411882a443dab6de4f5b62d893
|
||||
6574efee08d6b509c05cc4e9a93510665f0d8b844ef4dce0d8f2c2577068f0c8"
|
||||
|
||||
post_extract() {
|
||||
cd $build_wrksrc
|
||||
|
|
Loading…
Reference in a new issue