From cf59608a320289dfd08c225cd2a625eac4a522f0 Mon Sep 17 00:00:00 2001 From: "termux-actions[bot]" Date: Sun, 20 Mar 2022 02:27:28 +0000 Subject: [PATCH] packages/netpbm --- packages/netpbm/netpbm-security-code.patch | 13 ----------- packages/netpbm/util.c.patch | 25 ---------------------- 2 files changed, 38 deletions(-) delete mode 100644 packages/netpbm/util.c.patch diff --git a/packages/netpbm/netpbm-security-code.patch b/packages/netpbm/netpbm-security-code.patch index 8674eb7a0a..763b1a9163 100644 --- a/packages/netpbm/netpbm-security-code.patch +++ b/packages/netpbm/netpbm-security-code.patch @@ -227,19 +227,6 @@ index d8e0657..12c7468 100644 data = pbm_allocarray(nOutCols, nOutRows); -diff --git a/converter/pbm/mgrtopbm.c b/converter/pbm/mgrtopbm.c -index 9f7004a..60e8477 100644 ---- a/converter/pbm/mgrtopbm.c -+++ b/converter/pbm/mgrtopbm.c -@@ -65,6 +65,8 @@ readMgrHeader(FILE * const ifP, - if (head.h_high < ' ' || head.l_high < ' ') - pm_error("Invalid width field in MGR header"); - -+ overflow_add(*colsP, pad); -+ - *colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' '); - *rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' '); - *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP; diff --git a/converter/pbm/pbmto4425.c b/converter/pbm/pbmto4425.c index 1d97ac6..c4c8cbb 100644 --- a/converter/pbm/pbmto4425.c diff --git a/packages/netpbm/util.c.patch b/packages/netpbm/util.c.patch deleted file mode 100644 index 7a15a234d7..0000000000 --- a/packages/netpbm/util.c.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -u -r ../advanced/converter/other/cameratopam/util.c ./converter/other/cameratopam/util.c ---- ../advanced/converter/other/cameratopam/util.c 2014-12-29 02:10:41.516106336 -0500 -+++ ./converter/other/cameratopam/util.c 2014-12-29 02:35:33.156107368 -0500 -@@ -43,6 +43,21 @@ - return a << 24 | b << 16 | c << 8 | d; - } - -+static void -+swab (const void *bfrom, void *bto, ssize_t n) -+{ -+ const char *from = (const char *) bfrom; -+ char *to = (char *) bto; -+ -+ n &= ~((ssize_t) 1); -+ while (n > 1) -+ { -+ const char b0 = from[--n], b1 = from[--n]; -+ to[n] = b0; -+ to[n + 1] = b1; -+ } -+} -+ - /* - Faster than calling get2() multiple times. - */