From fefbe77ba0db0fa02dec6b1667625050aec1a044 Mon Sep 17 00:00:00 2001
From: leitner <leitner>
Date: Wed, 22 Nov 2006 09:54:03 +0000
Subject: [PATCH] work around gcc 4 bug (that optimizes away a security check)

---
 scan_asn1length.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scan_asn1length.c b/scan_asn1length.c
index 363bec5..7102274 100644
--- a/scan_asn1length.c
+++ b/scan_asn1length.c
@@ -1,3 +1,4 @@
+#include <inttypes.h>
 #include "asn1.h"
 
 unsigned int scan_asn1length(const char* src,const char* max,unsigned long* length) {
@@ -19,6 +20,6 @@ unsigned int scan_asn1length(const char* src,const char* max,unsigned long* leng
     *length=*src&0x7f;
   src++;
   if (src+*length>max) return 0;	/* catch integer overflow */
-  if (src+*length<src) return 0;
+  if ((uintptr_t)src+*length<(uintptr_t)src) return 0;	/* gcc 4 removes this check without the cast to uintptr_t */
   return src-orig;
 }