Security-58286.260.20.tar.gz

[apple/security.git] / OSX / libsecurity_asn1 / lib / plarena.h

diff --git a/OSX/libsecurity_asn1/lib/plarena.h b/OSX/libsecurity_asn1/lib/plarena.h
index 359e38513463999708a40f86678989005dfb5037..ef8a5d6a62aa5e628ba52d697fd555646f3ca96d 100644 (file)
--- a/OSX/libsecurity_asn1/lib/plarena.h
+++ b/OSX/libsecurity_asn1/lib/plarena.h
@@ -123,7 +123,7 @@ struct PLArenaPool {
     PR_BEGIN_MACRO \
         PLArena *_a = (pool)->current; \
         PRUword _q = (PRUword)p + size + incr;  /*__APPLE__ */ \
     PR_BEGIN_MACRO \
         PLArena *_a = (pool)->current; \
         PRUword _q = (PRUword)p + size + incr;  /*__APPLE__ */ \

-        if ((p < p + size) && (_q > p) &&  (_q > p + size) && /*__APPLE__ avoid overflow in _q*/ \
+        if ((p < p + size) && (_q > (PRUword)p) &&  (_q > (PRUword)p + size) && /*__APPLE__ avoid overflow in _q*/ \

             _a->avail == (PRUword)(p) + PL_ARENA_ALIGN(pool, size) && \
             _q <= PL_ARENA_ALIGN(pool,_q) && /*__APPLE__ avoid overflow from alignment*/ \
             _a->limit >= PL_ARENA_ALIGN(pool,_q)) { /* __APPLE__ expanded buffer within arena*/ \
             _a->avail == (PRUword)(p) + PL_ARENA_ALIGN(pool, size) && \
             _q <= PL_ARENA_ALIGN(pool,_q) && /*__APPLE__ avoid overflow from alignment*/ \
             _a->limit >= PL_ARENA_ALIGN(pool,_q)) { /* __APPLE__ expanded buffer within arena*/ \