diff options
| author | Daniel Engberg <daniel.engberg.lists@pyret.net> | 2021-07-31 20:03:52 +0000 |
|---|---|---|
| committer | Li-Wen Hsu <lwhsu@FreeBSD.org> | 2021-07-31 20:03:52 +0000 |
| commit | 0e8cb6eb96e1a55e7d57deea3d79b3ba5d6e6ac5 (patch) | |
| tree | a892da6cb1e4404d02f5d6ffacf0af100920f9d3 | |
| parent | 36abc263a4bb4590d3f152bf1b95c8ca5fed90a8 (diff) | |
| download | ports-0e8cb6eb96e1a55e7d57deea3d79b3ba5d6e6ac5.tar.gz ports-0e8cb6eb96e1a55e7d57deea3d79b3ba5d6e6ac5.zip | |
devel/judy: Import patch to fix memory corruption
PR: 257429
Obtained from: https://github.com/netdata/libjudy/commit/e95874a4e271d0f8535ab78862af3d57d33e9d1e
| -rw-r--r-- | devel/judy/Makefile | 8 | ||||
| -rw-r--r-- | devel/judy/files/patch-src_JudyCommon_JudyPrivateBranch.h | 63 |
2 files changed, 67 insertions, 4 deletions
diff --git a/devel/judy/Makefile b/devel/judy/Makefile index 5ec3d1cd893d..0fa62305b12d 100644 --- a/devel/judy/Makefile +++ b/devel/judy/Makefile @@ -1,10 +1,10 @@ # Created by: Sergey Skvortsov <skv@protey.ru> PORTNAME= Judy -PORTVERSION= 1.0.5 -PORTREVISION= 2 +DISTVERSION= 1.0.5 +PORTREVISION= 3 CATEGORIES= devel -MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTNAME}-${PORTVERSION} +MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTNAME}-${DISTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= General purpose dynamic array @@ -20,7 +20,7 @@ USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes INSTALL_TARGET= install-strip -WRKSRC= ${WRKDIR}/${PORTNAME:tl}-${PORTVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME:tl}-${DISTVERSION} PORTDOCS= COPYRIGHT README *.htm diff --git a/devel/judy/files/patch-src_JudyCommon_JudyPrivateBranch.h b/devel/judy/files/patch-src_JudyCommon_JudyPrivateBranch.h new file mode 100644 index 000000000000..1ec54f729247 --- /dev/null +++ b/devel/judy/files/patch-src_JudyCommon_JudyPrivateBranch.h @@ -0,0 +1,63 @@ +--- src/JudyCommon/JudyPrivateBranch.h.orig 2005-02-15 21:06:07 UTC ++++ src/JudyCommon/JudyPrivateBranch.h +@@ -55,7 +55,7 @@ typedef struct J_UDY_POINTER_OTHERS // JPO. + { + Word_t j_po_Addr; // first word: Pjp_t, Word_t, etc. + union { +-// Word_t j_po_DcdPop0:cJU_BITSPERWORD-cJU_BITSPERBYTE; ++ Word_t j_po_Addr1; + uint8_t j_po_DcdP0[sizeof(Word_t) - 1]; + uint8_t j_po_Bytes[sizeof(Word_t)]; // last byte = jp_Type. + } jpo_u; +@@ -78,13 +78,18 @@ typedef struct J_UDY_POINTER_OTHERS // JPO. + // TBD: Revise this structure to not overload j_po_DcdPopO this way? The + // current arrangement works, its just confusing. + +-typedef struct _JUDY_POINTER_IMMED // JPI. ++typedef struct _JUDY_POINTER_IMMEDL + { +- uint8_t j_pi_1Index[sizeof(Word_t)]; // see above. +- uint8_t j_pi_LIndex[sizeof(Word_t) - 1]; // see above. +- uint8_t j_pi_Type; // JP type, 1 of cJ*_JPIMMED*. +- } jpi_t; ++ Word_t j_pL_Addr; ++ uint8_t j_pL_LIndex[sizeof(Word_t) - 1]; // see above. ++ uint8_t j_pL_Type; ++ } jpL_t; + ++typedef struct _JUDY_POINTER_IMMED1 ++ { ++ uint8_t j_p1_1Index[(2 * sizeof(Word_t)) - 1]; ++ uint8_t j_p1_Type; ++ } jp1_t; + + // UNION OF JP TYPES: + // +@@ -96,18 +101,22 @@ typedef struct _JUDY_POINTER_IMMED // JPI. + typedef union J_UDY_POINTER // JP. + { + jpo_t j_po; // other than immediate indexes. +- jpi_t j_pi; // immediate indexes. ++ jpL_t j_pL; // immediate indexes. ++ jp1_t j_p1; // immediate indexes. + } jp_t, *Pjp_t; + + // For coding convenience: + // +-// Note, jp_Type has the same bits in jpo_t and jpi_t. ++// Note, jp_Type has the same bits in jpo_t jpL_t and jp1_t. + +-#define jp_1Index j_pi.j_pi_1Index // for storing Indexes in first word. +-#define jp_LIndex j_pi.j_pi_LIndex // for storing Indexes in second word. ++#define jp_1Index j_p1.j_p1_1Index // for storing Indexes in first word. ++#define jp_LIndex j_pL.j_pL_LIndex // for storing Indexes in second word. + #define jp_Addr j_po.j_po_Addr ++#define jp_Addr1 j_po.jpo_u.j_po_Addr1 + //#define jp_DcdPop0 j_po.jpo_u.j_po_DcdPop0 +-#define jp_Type j_po.jpo_u.j_po_Bytes[sizeof(Word_t) - 1] ++#define jp_Addr1 j_po.jpo_u.j_po_Addr1 ++//#define jp_Type j_po.jpo_u.j_po_Bytes[sizeof(Word_t) - 1] ++#define jp_Type j_p1.j_p1_Type + #define jp_DcdP0 j_po.jpo_u.j_po_DcdP0 + + |