safety

vlm · Aug 2, 2017 · 39837e6 · 39837e6
1 parent d88bea9
commit 39837e6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/skeletons/asn_system.h b/skeletons/asn_system.h
@@ -138,4 +138,12 @@ typedef	unsigned int	uint32_t;
 #endif /* __GNUC__ */
 #endif	/* MIN */
 
+#ifndef SIZE_MAX
+#define SIZE_MAX   ULONG_MAX
+#endif
+
+#ifndef RSIZE_MAX   /* C11, Annex K */
+#define RSIZE_MAX   (SIZE_MAX >> 1)
+#endif
+
 #endif	/* ASN_SYSTEM_H */
diff --git a/skeletons/oer_support.c b/skeletons/oer_support.c
@@ -57,6 +57,9 @@ oer_fetch_length(const void *bufptr, size_t size, size_t *len_r) {
         len = (len << 8) + *b;
     }
 
+    if(len > RSIZE_MAX) /* A bit of C11 validation */
+        return -1;
+
     *len_r = len;
     assert(len_len + 1 == bend - (const uint8_t *)bufptr);
     return len_len + 1;