check for overflows

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/decoding.c b/lib/decoding.c
index 00ae287..32888a3 100644
--- a/lib/decoding.c
+++ b/lib/decoding.c
@@ -115,15 +115,17 @@ asn1_get_length_der (const unsigned char *der, int der_len, int *len)
 static int
 asn1_get_length_der_checked (const unsigned char *der, int der_len, int *len)
 {
-int ret;
+int ret, tot;
 
   ret = asn1_get_length_der(der, der_len, len);
   if (ret < 0)
     return ret;
-    
-  if (ret + *len > der_len)
-    return -3;
   
+  tot = ret + *len;
+  
+  if (tot < 0 || tot > der_len)
+    return -3;
+
   return ret;
 }