Merge pull request #16 from cristivlas/fix-c++20-crash

jdart1 · web-flow · commit daea7c5d1e7a · 2025-09-27T13:07:01.000-07:00
Fix c++20 issue when allocation/deallocating pawnEntry and pieceEntry
diff --git a/src/tbprobe.c b/src/tbprobe.c
@@ -896,8 +896,25 @@ bool tb_init(const char *path)
   TB_MaxCardinality = TB_MaxCardinalityDTM = 0;
 
   if (!pieceEntry) {
+#if defined(__cplusplus) && (__cplusplus >= 202002L)
+    /* Fix crash with -std=c++20 by being consistent with BaseEntry initialization:
+
+        #if __cplusplus >= 202002L
+            atomic<bool> ready[3]{false, false, false};
+        #else
+            ...
+
+        C++ initialization does not work with malloc.
+        Also: with new, if the allocation fails we get std::bad_alloc exception,
+        which is better library behavior than just calling exit.
+     */
+
+    pieceEntry = new PieceEntry[TB_MAX_PIECE]();
+    pawnEntry = new PawnEntry[TB_MAX_PAWN]();
+#else
     pieceEntry = (struct PieceEntry*)malloc(TB_MAX_PIECE * sizeof(*pieceEntry));
     pawnEntry = (struct PawnEntry*)malloc(TB_MAX_PAWN * sizeof(*pawnEntry));
+#endif
     if (!pieceEntry || !pawnEntry) {
       fprintf(stderr, "Out of memory.\n");
       exit(EXIT_FAILURE);
@@ -1018,9 +1035,14 @@ bool tb_init(const char *path)
 void tb_free(void)
 {
   tb_init("");
+#if defined __cplusplus && __cplusplus >= 202002L
+  delete[] pieceEntry;
+  delete[] pawnEntry;
+#else
   free(pieceEntry);
-  pieceEntry = NULL;
   free(pawnEntry);
+#endif
+  pieceEntry = NULL;
   pawnEntry = NULL;
 }
 
