ROCm 7.x fix error and warnings

Author: TomTheBear

src/access-daemon/appDaemon.c

@@ -84,7 +84,11 @@ static void prepare_ldpreload()
             bconchar(new_bldpre, ':');
         }
     }
-    setenv("LD_PRELOAD", bdata(new_bldpre), 1);
+    char* new_bldpre_c = NULL;
+    if (bdata(new_bldpre) != NULL) {
+        new_bldpre_c = bdata(new_bldpre);
+    }
+    setenv("LD_PRELOAD", new_bldpre_c, 1);
     bstrListDestroy(liblist);
     bdestroy(new_bldpre);
     bdestroy(bldpre);

src/rocmon.c

@@ -218,12 +218,8 @@ static rocprofiler_tool_configure_result_t *rocprofiler_configure_private(
     id->name = "LIKWID rocmon";
 
     const uint32_t major = version / 10000;
-    const uint32_t minor = (version % 10000) / 100;
-    const uint32_t patch = version % 100;
 
     assert(major == 1);
-    assert(minor == 0);
-    assert(patch == 0);
 
     static rocprofiler_tool_configure_result_t cfg = {
         sizeof(cfg),
@@ -454,7 +450,7 @@ static int smi_event_add_impl(const char *name, RocmonSmiEventType type, const c
     list->numEntries = newNumEntries;
     list->entries    = newEntries;
 
-    snprintf(newEvent->name, sizeof(newEvent->name), "%s", name);
+    snprintf(newEvent->name, sizeof(newEvent->name)-1, "%s", name);
     newEvent->type       = type;
     newEvent->variant    = variant;
     newEvent->subvariant = subvariant;
@@ -491,8 +487,14 @@ static int smi_events_add_avail(RocmonDevice *device, RocmonSmiEventType type, c
 
         if (type == ROCMON_SMI_EVENT_TYPE_INSTANCES) {
             // For instanced events (like sensor lists), create a list of events
-            snprintf(
-                availEvent->name, sizeof(availEvent->name), "%s[%zu]", implEvent->name, subvariant);
+            int len = snprintf(availEvent->name,
+                               sizeof(availEvent->name),
+                               "%s[%zu]",
+                               implEvent->name, subvariant);
+            if (len < 0) {
+                ERROR_PRINT("Failed to add subvariant %zu to event %s\n", subvariant, implEvent->name);
+                continue;
+            };
             availEvent->subvariant = subvariant;
         } else {
             assert(subvariant == implEvent->subvariant);

src/rocmon_marker.c

@@ -131,8 +131,13 @@ static int gpulist_from_str(const char *gpustring, size_t *numGpus, int **gpus)
     *numGpus = gpustrings->qty;
     *gpus    = newGpus;
 
-    for (int i = 0; i < gpustrings->qty; i++)
-        newGpus[i] = atoi(bdata(gpustrings->entry[i]));
+    for (int i = 0; i < gpustrings->qty; i++) {
+        char* s = NULL;
+        if (bdata(gpustrings->entry[i]) != NULL) {
+            s = bdata(gpustrings->entry[i]);
+        }
+        newGpus[i] = atoi(s);
+    }
 
 cleanup:
     if (err < 0)
@@ -291,7 +296,7 @@ int rocmon_markerInit(void)
         perfmon_setVerbosity(atoi(debugStr));
 
     int *gpuIds = NULL;
-    size_t numGpuIds;
+    size_t numGpuIds = 0;
     err = gpulist_from_str(gpuStr, &numGpuIds, &gpuIds);
     if (err < 0)
         goto unlock_err;
@@ -1034,6 +1039,7 @@ int rocmon_markerWriteFile(const char *markerfile)
 
 int rocmon_markerInitResultsFromFile(const char *markerfile)
 {
+    FILE *fp = NULL;
     pthread_mutex_lock(&rocmarker_init_mutex);
 
     int err = 0;
@@ -1056,7 +1062,7 @@ int rocmon_markerInitResultsFromFile(const char *markerfile)
 
     rocmarker_ctx->main_tid = DUMMY_TID;
 
-    FILE *fp = fopen(markerfile, "r");
+    fp = fopen(markerfile, "r");
     if (!fp) {
         err = -errno;
         goto unlock_err;
@@ -1148,7 +1154,8 @@ int rocmon_markerInitResultsFromFile(const char *markerfile)
             }
         }
 
-        fscanf(fp, "\n");
+        int d = fscanf(fp, "\n");
+        d++;
     }
 
     // Read regions: 'regionIdx groupId regionTag'