--- embedaddon/miniupnpd/codelength.h	2012/02/21 23:16:02	1.1.1.1
+++ embedaddon/miniupnpd/codelength.h	2013/07/22 00:32:35	1.1.1.2
@@ -1,18 +1,25 @@
-/* $Id: codelength.h,v 1.1.1.1 2012/02/21 23:16:02 misho Exp $ */
+/* $Id: codelength.h,v 1.1.1.2 2013/07/22 00:32:35 misho Exp $ */
 /* Project : miniupnp
  * Author : Thomas BERNARD
- * copyright (c) 2005-2008 Thomas Bernard
+ * copyright (c) 2005-2011 Thomas Bernard
  * This software is subjet to the conditions detailed in the
  * provided LICENCE file. */
-#ifndef __CODELENGTH_H__
-#define __CODELENGTH_H__
+#ifndef CODELENGTH_H_INCLUDED
+#define CODELENGTH_H_INCLUDED
 
 /* Encode length by using 7bit per Byte :
  * Most significant bit of each byte specifies that the
  * following byte is part of the code */
 #define DECODELENGTH(n, p) n = 0; \
                            do { n = (n << 7) | (*p & 0x7f); } \
-                           while(*(p++)&0x80);
+                           while((*(p++)&0x80) && (n<(1<<25)));
+
+#define DECODELENGTH_CHECKLIMIT(n, p, p_limit) \
+	n = 0; \
+	do { \
+		if((p) >= (p_limit)) break; \
+		n = (n << 7) | (*(p) & 0x7f); \
+	} while((*((p)++)&0x80) && (n<(1<<25)));
 
 #define CODELENGTH(n, p) if(n>=268435456) *(p++) = (n >> 28) | 0x80; \
                          if(n>=2097152) *(p++) = (n >> 21) | 0x80; \