Sanitize system_architecture fallback, and fallback to unknown

Signed-off-by: Peter M <petermm@gmail.com>

Author: petermm

src/libAtomVM/CMakeLists.txt

@@ -314,6 +314,24 @@ if (NOT DEFINED AVM_SYSTEM_ARCHITECTURE_STRING)
     set(AVM_SYSTEM_ARCHITECTURE_STRING "")
 endif()
 
+set(AVM_SYSTEM_NAME_SANITIZED "${CMAKE_SYSTEM_NAME}")
+if (AVM_SYSTEM_NAME_SANITIZED STREQUAL "")
+    set(AVM_SYSTEM_NAME_SANITIZED "unknown")
+endif()
+string(REPLACE "-" "_" AVM_SYSTEM_NAME_SANITIZED "${AVM_SYSTEM_NAME_SANITIZED}")
+
+set(AVM_SYSTEM_VERSION_SANITIZED "${CMAKE_SYSTEM_VERSION}")
+if (AVM_SYSTEM_VERSION_SANITIZED STREQUAL "")
+    set(AVM_SYSTEM_VERSION_SANITIZED "unknown")
+endif()
+string(REPLACE "-" "_" AVM_SYSTEM_VERSION_SANITIZED "${AVM_SYSTEM_VERSION_SANITIZED}")
+
+set(AVM_SYSTEM_ARCHITECTURE_SANITIZED "${CMAKE_SYSTEM_PROCESSOR}")
+if (AVM_SYSTEM_ARCHITECTURE_SANITIZED STREQUAL "")
+    set(AVM_SYSTEM_ARCHITECTURE_SANITIZED "unknown")
+endif()
+string(REPLACE "-" "_" AVM_SYSTEM_ARCHITECTURE_SANITIZED "${AVM_SYSTEM_ARCHITECTURE_SANITIZED}")
+
 # Add include to directory where avm_version.h is generated so targets linking
 # libAtomVM can access it
 target_include_directories(libAtomVM PUBLIC ${CMAKE_CURRENT_BINARY_DIR})

src/libAtomVM/nifs.c

@@ -3077,7 +3077,7 @@ static term nif_erlang_system_info(Context *ctx, int argc, term argv[])
         if (SYSTEM_ARCHITECTURE_STRING[0] != '\0') {
             snprintf(buf, 128, "%s", SYSTEM_ARCHITECTURE_STRING);
         } else {
-            snprintf(buf, 128, "%s-%s-%s", SYSTEM_NAME, SYSTEM_VERSION, SYSTEM_ARCHITECTURE);
+            snprintf(buf, 128, "%s-%s-%s", SYSTEM_NAME_SANITIZED, SYSTEM_VERSION_SANITIZED, SYSTEM_ARCHITECTURE_SANITIZED);
         }
         size_t len = strnlen(buf, 128);
         if (memory_ensure_free_opt(ctx, term_binary_heap_size(len), MEMORY_CAN_SHRINK) != MEMORY_GC_OK) {

src/libAtomVM/version.h.in

@@ -21,5 +21,8 @@
 #define SYSTEM_NAME "${CMAKE_SYSTEM_NAME}"
 #define SYSTEM_VERSION "${CMAKE_SYSTEM_VERSION}"
 #define SYSTEM_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}"
+#define SYSTEM_NAME_SANITIZED "${AVM_SYSTEM_NAME_SANITIZED}"
+#define SYSTEM_VERSION_SANITIZED "${AVM_SYSTEM_VERSION_SANITIZED}"
+#define SYSTEM_ARCHITECTURE_SANITIZED "${AVM_SYSTEM_ARCHITECTURE_SANITIZED}"
 #define SYSTEM_ARCHITECTURE_STRING "${AVM_SYSTEM_ARCHITECTURE_STRING}"
 #define ATOMVM_VERSION "${ATOMVM_VERSION}"