modifyRPath: return early if new and old rpath are empty

Emery Hemingway · Emery Hemingway · commit 761b494a9f5e · 2022-05-20T10:51:19.000-05:00
diff --git a/src/patchelf.cc b/src/patchelf.cc
@@ -1350,8 +1350,8 @@ void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op,
     debug("new rpath is '%s'\n", newRPath.c_str());
 
 
-    if (rpath && newRPath.size() <= rpathSize) {
-        memcpy(rpath, newRPath.c_str(), newRPath.size() + 1);
+    if (newRPath.size() <= rpathSize) {
+        if (rpath) memcpy(rpath, newRPath.c_str(), newRPath.size() + 1);
         return;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1350,8 +1350,8 @@ void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op,`
`1350`	`1350`	`debug("new rpath is '%s'\n", newRPath.c_str());`
`1351`	`1351`
`1352`	`1352`
`1353`		`- if (rpath && newRPath.size() <= rpathSize) {`
`1354`		`- memcpy(rpath, newRPath.c_str(), newRPath.size() + 1);`
	`1353`	`+ if (newRPath.size() <= rpathSize) {`
	`1354`	`+ if (rpath) memcpy(rpath, newRPath.c_str(), newRPath.size() + 1);`
`1355`	`1355`	`return;`
`1356`	`1356`	`}`
`1357`	`1357`