PhysicalMemory: don't print (null) in property locator

CarterLi · CarterLi · commit 3415d8197cde · 2024-07-05T11:01:04.000+08:00
diff --git a/src/detection/physicalmemory/physicalmemory_linux.c b/src/detection/physicalmemory/physicalmemory_linux.c
@@ -113,7 +113,15 @@ const char* ffDetectPhysicalMemory(FFlist* result)
             }
         }
 
-        ffStrbufSetF(&device->locator, "%s/%s", ffSmbiosLocateString(strings, data->BankLocator), ffSmbiosLocateString(strings, data->DeviceLocator));
+        // https://github.com/fastfetch-cli/fastfetch/issues/1051#issuecomment-2206687345
+        const char* lbank = ffSmbiosLocateString(strings, data->BankLocator);
+        const char* ldevice = ffSmbiosLocateString(strings, data->DeviceLocator);
+        if (lbank && ldevice)
+            ffStrbufSetF(&device->locator, "%s/%s", lbank, ldevice);
+        else if (lbank)
+            ffStrbufSetS(&device->locator, lbank);
+        else if (ldevice)
+            ffStrbufSetS(&device->locator, ldevice);
 
         switch (data->FormFactor)
         {

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,15 @@ const char* ffDetectPhysicalMemory(FFlist* result)`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`		`- ffStrbufSetF(&device->locator, "%s/%s", ffSmbiosLocateString(strings, data->BankLocator), ffSmbiosLocateString(strings, data->DeviceLocator));`
	`116`	`+ // https://github.com/fastfetch-cli/fastfetch/issues/1051#issuecomment-2206687345`
	`117`	`+ const char* lbank = ffSmbiosLocateString(strings, data->BankLocator);`
	`118`	`+ const char* ldevice = ffSmbiosLocateString(strings, data->DeviceLocator);`
	`119`	`+ if (lbank && ldevice)`
	`120`	`+ ffStrbufSetF(&device->locator, "%s/%s", lbank, ldevice);`
	`121`	`+ else if (lbank)`
	`122`	`+ ffStrbufSetS(&device->locator, lbank);`
	`123`	`+ else if (ldevice)`
	`124`	`+ ffStrbufSetS(&device->locator, ldevice);`
`117`	`125`
`118`	`126`	`switch (data->FormFactor)`
`119`	`127`	`{`