Merge branch 'maint'

* maint: Protect binary_to_term/1 against bad binaries on 32-bit systems
unbalancedparentheses · Sep 7, 2021 · a0c06d9 · a0c06d9
2 parents 2ef0ca2 + b67aa7f
commit a0c06d9
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c
@@ -5571,6 +5571,12 @@ decoded_size(const byte *ep, const byte* endp, int internal_tags, B2TContext* ct
             if (n <= MAP_SMALL_MAP_LIMIT) {
                 heap_size += 3 + n + 1 + n;
             } else {
+#if !defined(ARCH_64)
+                if ((n >> 30) != 0) {
+                    /* Can't possibly fit in memory. */
+                    goto error;
+                }
+#endif
                 CHKSIZE(2*n);   /* Conservative size check */
                 heap_size += HASHMAP_ESTIMATED_HEAP_SIZE(n);
             }