Kajetan Johannes Hammerle 9 mesiacov pred
rodič
commit
e7e479678c
2 zmenil súbory, kde vykonal 4 pridanie a 3 odobranie
  1. 2 2
      src/ToString.c
  2. 2 1
      src/Utility.c

+ 2 - 2
src/ToString.c

@@ -60,8 +60,8 @@ size_t toStringBox(const Box* box, char* buffer, size_t n) {
     return coreToString(buffer, n,
                         "Box([%.3f, %.3f, %.3f], [%.3f, %.3f, %.3f])",
                         (double)box->min.data[0], (double)box->min.data[1],
-                        (double)box->min.data[2], (double)box->min.data[3],
-                        (double)box->min.data[4], (double)box->min.data[5]);
+                        (double)box->min.data[2], (double)box->max.data[0],
+                        (double)box->max.data[1], (double)box->max.data[2]);
 }
 
 size_t toStringMatrix(const Matrix* m, char* buffer, size_t n) {

+ 2 - 1
src/Utility.c

@@ -1,6 +1,7 @@
 #define IMPORT_CORE
 #include "core/Utility.h"
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <threads.h>
@@ -106,7 +107,7 @@ static void addMemoryInfo(MemoryInfo* info, const char* file, int line,
     info->previous = nullptr;
     info->size = n;
     info->line = line;
-    strncpy(info->buffer, getShortFileName(file), sizeof(info->buffer));
+    snprintf(info->buffer, sizeof(info->buffer), "%s", getShortFileName(file));
     memcpy(info->canary, CANARY, sizeof(CANARY));
     memcpy((char*)info + n - sizeof(CANARY), CANARY, sizeof(CANARY));
     if(headMemoryInfo == nullptr) {