Forward port changes from v0.6 release branch

From release-0.6 branch:
Merge a couple of fixes:
- module: do not abort when OOM while loading literal (#1689)
- Fix potential memory corruption with boxed immediate integers #1690
Also:
- CI: release-0.6 bump esp-idf patch versions #1687
- NIFs: fix "warning: initializer-string for character array is too long"

Author: bettio

.github/workflows/esp32-build.yaml

@@ -48,23 +48,23 @@ jobs:
         esp-idf-target: ["esp32", "esp32c3", "esp32p4"]
         language: ['cpp']
         idf-version:
-         - 'v5.0.7'
-         - 'v5.1.5'
-         - 'v5.2.3'
-         - 'v5.3.2'
-         - 'v5.4'
+         - 'v5.0.9'
+         - 'v5.1.6'
+         - 'v5.2.5'
+         - 'v5.3.3'
+         - 'v5.4.1'
 
         exclude:
         - esp-idf-target: "esp32c3"
-          idf-version: 'v5.0.7'
+          idf-version: 'v5.0.9'
         - esp-idf-target: "esp32c3"
-          idf-version: 'v5.1.5'
+          idf-version: 'v5.1.6'
         - esp-idf-target: "esp32p4"
-          idf-version: 'v5.0.7'
+          idf-version: 'v5.0.9'
         - esp-idf-target: "esp32p4"
-          idf-version: 'v5.1.5'
+          idf-version: 'v5.1.6'
         - esp-idf-target: "esp32p4"
-          idf-version: 'v5.2.3'
+          idf-version: 'v5.2.5'
 
     steps:
     - name: Checkout repo

.github/workflows/esp32-simtest.yaml

@@ -80,16 +80,16 @@ jobs:
             "esp32h2",
             "esp32p4",
           ]
-        idf-version: ${{ ((contains(github.event.head_commit.message, 'full_sim_test')||contains(github.event.pull_request.title, 'full_sim_test')) &&  fromJSON('["v5.1.5", "v5.2.3", "v5.3.2", "v5.4"]')) || fromJSON('["v5.3.2"]') }}
+        idf-version: ${{ ((contains(github.event.head_commit.message, 'full_sim_test')||contains(github.event.pull_request.title, 'full_sim_test')) &&  fromJSON('["v5.1.6", "v5.2.5", "v5.3.3", "v5.4.1"]')) || fromJSON('["v5.3.3"]') }}
         exclude:
           - esp-idf-target: "esp32p4"
-            idf-version: "v5.1.5"
+            idf-version: "v5.1.6"
           - esp-idf-target: "esp32p4"
-            idf-version: "v5.2.3"
+            idf-version: "v5.2.5"
           - esp-idf-target: "esp32h2"
-            idf-version: "v5.1.5"
+            idf-version: "v5.1.6"
           - esp-idf-target: "esp32h2"
-            idf-version: "v5.2.3"
+            idf-version: "v5.2.5"
 
     steps:
       - name: Checkout repo

CHANGELOG.md

@@ -126,6 +126,9 @@ memory error
 - Fixed nif_atomvm_posix_read GC bug
 - Fixed `erlang:is_number/1` function, now returns true also for floats
 - Fixed unlink protocol and add support for `link/1` on ports
+- Do not abort when an out of memory happens while loading a literal value
+- Fixed potential memory corruption when handling integer immediates that are stored as boxed
+integer (this never happens with integers < 28 bits)
 
 ### Changed
 

src/libAtomVM/module.c

@@ -446,9 +446,8 @@ static struct LiteralEntry *module_build_literals_table(const void *literalsBuf)
 term module_load_literal(Module *mod, int index, Context *ctx)
 {
     term t = externalterm_from_const_literal(mod->literals_table[index].data, mod->literals_table[index].size, ctx);
-    if (term_is_invalid_term(t)) {
-        fprintf(stderr, "Invalid term reading literals_table[%i] from module\n", index);
-        AVM_ABORT();
+    if (UNLIKELY(term_is_invalid_term(t))) {
+        fprintf(stderr, "Either OOM or invalid term while reading literals_table[%i] from module\n", index);
     }
     return t;
 }

src/libAtomVM/nifs.c

@@ -4613,7 +4613,13 @@ static term nif_console_print(Context *ctx, int argc, term argv[])
     return OK_ATOM;
 }
 
-static char b64_table[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+static char b64_table[64] = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
+                             'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+                             'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
+                             'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+                             'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
+                             'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7',
+                             '8', '9', '+', '/'};
 
 // per https://tools.ietf.org/rfc/rfc4648.txt
 

src/libAtomVM/opcodesswitch.h

@@ -1568,21 +1568,27 @@ static term maybe_alloc_boxed_integer_fragment(Context *ctx, avm_int64_t value)
 {
 #if BOXED_TERMS_REQUIRED_FOR_INT64 > 1
     if ((value < AVM_INT_MIN) || (value > AVM_INT_MAX)) {
-        if (UNLIKELY(memory_ensure_free_opt(ctx, BOXED_INT64_SIZE, MEMORY_NO_GC) != MEMORY_GC_OK)) {
+        Heap heap;
+        if (UNLIKELY(memory_init_heap(&heap, BOXED_INT64_SIZE) != MEMORY_GC_OK)) {
             ctx->x[0] = ERROR_ATOM;
             ctx->x[1] = OUT_OF_MEMORY_ATOM;
             return term_invalid_term();
         }
-        return term_make_boxed_int64(value, &ctx->heap);
+        memory_heap_append_heap(&ctx->heap, &heap);
+
+        return term_make_boxed_int64(value, &heap);
     } else
 #endif
     if ((value < MIN_NOT_BOXED_INT) || (value > MAX_NOT_BOXED_INT)) {
-        if (UNLIKELY(memory_ensure_free_opt(ctx, BOXED_INT_SIZE, MEMORY_NO_GC) != MEMORY_GC_OK)) {
+        Heap heap;
+        if (UNLIKELY(memory_init_heap(&heap, BOXED_INT_SIZE) != MEMORY_GC_OK)) {
             ctx->x[0] = ERROR_ATOM;
             ctx->x[1] = OUT_OF_MEMORY_ATOM;
             return term_invalid_term();
         }
-        return term_make_boxed_int(value, &ctx->heap);
+        memory_heap_append_heap(&ctx->heap, &heap);
+
+        return term_make_boxed_int(value, &heap);
     } else {
         return term_from_int(value);
     }