test

Author: firewave

cli/stacktrace.cpp

@@ -31,11 +31,20 @@
 void print_stacktrace(FILE* output, int start_idx, bool demangling, int maxdepth, bool omit_above_own)
 {
     fputs("print_stacktrace\n", output);
+
     // 32 vs. 64bit
-#define ADDRESSDISPLAYLENGTH ((sizeof(long)==8)?12:8)
+    static constexpr auto ADDRESSDISPLAYLENGTH = (sizeof(long) == 8) ? 12 : 8;
+
     void *callstackArray[32]= {nullptr}; // the less resources the better...
     fputs("backtrace\n", output);
     const int currentdepth = backtrace(callstackArray, static_cast<int>(getArrayLength(callstackArray)));
+    if (currentdepth == 0) {
+        fputs("Callstack could not be obtained (backtrace)\n", output);
+        return;
+    }
+    if (currentdepth == getArrayLength(callstackArray)) {
+        fputs("Callstack might be truncated\n", output);
+    }
     fprintf(output, "currentdepth %d\n", currentdepth);
     // set offset to 1 to omit the printing function itself
     int offset=start_idx+1; // some entries on top are within our own exception handling code or libc
@@ -49,7 +58,7 @@ void print_stacktrace(FILE* output, int start_idx, bool demangling, int maxdepth
     fputs("backtrace_symbols\n", output);
     char **symbolStringList = backtrace_symbols(callstackArray, currentdepth);
     if (!symbolStringList) {
-        fputs("Callstack could not be obtained\n", output);
+        fputs("Callstack could not be obtained (backtrace_symbols)\n", output);
         return;
     }
 
@@ -70,19 +79,9 @@ void print_stacktrace(FILE* output, int start_idx, bool demangling, int maxdepth
         }
         fprintf(output, "offset %d\n", offset);
         const char * realnameString = nullptr;
-        const char * const firstBracketName     = strchr(symbolString, '(');
-        fprintf(output, "firstBracketName %p\n", (void*)firstBracketName);
-        const char * const firstBracketAddress  = strchr(symbolString, '[');
-        fprintf(output, "firstBracketAddress %p\n", (void*)firstBracketAddress);
-        const char * const secondBracketAddress = strchr(firstBracketAddress, ']');
-        fprintf(output, "secondBracketAddress %p\n", (void*)secondBracketAddress);
-        const char * const beginAddress         = firstBracketAddress+3;
-        fprintf(output, "beginAddress %p\n", (void*)beginAddress);
-        const int addressLen = int(secondBracketAddress-beginAddress);
-        fprintf(output, "addressLen %d\n", addressLen);
-        const int padLen     = (ADDRESSDISPLAYLENGTH-addressLen);
-        fprintf(output, "padLen %d\n", padLen);
-        if (demangling && firstBracketName) {
+        if (demangling) {
+            const char * const firstBracketName = strchr(symbolString, '(');
+            fprintf(output, "firstBracketName %p\n", (void*)firstBracketName);
             const char * const plus = strchr(firstBracketName, '+');
             if (plus && (plus>(firstBracketName+1))) {
                 char input_buffer[1024]= {0};
@@ -97,6 +96,20 @@ void print_stacktrace(FILE* output, int start_idx, bool demangling, int maxdepth
         const int ordinal=i-offset;
         fprintf(output, "#%-2d 0x",
                 ordinal);
+
+        const char * const firstBracketAddress  = strchr(symbolString, '[');
+        fprintf(output, "firstBracketAddress %p\n", (void*)firstBracketAddress);
+        const char * const secondBracketAddress = strchr(firstBracketAddress, ']');
+        fprintf(output, "secondBracketAddress %p\n", (void*)secondBracketAddress);
+        const int padLen = [&]() {
+            // TODO: handle firstBracketAddress being NULL
+            const char * const beginAddress         = firstBracketAddress+3;
+            fprintf(output, "beginAddress %p\n", (void*)beginAddress);
+            const int addressLen = int(secondBracketAddress-beginAddress);
+            fprintf(output, "addressLen %d\n", addressLen);
+            return (ADDRESSDISPLAYLENGTH-addressLen);
+        }();
+        fprintf(output, "padLen %d\n", padLen);
         if (padLen>0)
             fprintf(output, "%0*d",
                     padLen, 0);
@@ -112,7 +125,6 @@ void print_stacktrace(FILE* output, int start_idx, bool demangling, int maxdepth
     }
     // NOLINTNEXTLINE(bugprone-multi-level-implicit-pointer-conversion) - code matches the documented usage
     free(symbolStringList);
-#undef ADDRESSDISPLAYLENGTH
 }
 
 #endif // USE_UNIX_BACKTRACE_SUPPORT