Merge pull request #153 from marcgurevitx/fix-rawdata-realloc-ub

Free data on RawData.resize(0)
JoeStrout · Jul 28, 2024 · 264f7dd · 264f7dd
2 parents 1ce1036 + bac7888
commit 264f7dd
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/MiniScript-cpp/src/ShellIntrinsics.cpp b/MiniScript-cpp/src/ShellIntrinsics.cpp
@@ -102,15 +102,16 @@ class RawDataHandleStorage : public RefCountedStorage {
 	}
 	virtual ~RawDataHandleStorage() { free(data); }
 	void resize(size_t newSize) {
-		if (data) {
+		if (newSize == 0) {
+			free(data);
+			data = nullptr;
+			dataSize = 0;
+		} else {
 			void *newData = realloc(data, newSize);
 			if (newData) {
 				data = newData;
 				dataSize = newSize;
 			}
-		} else {
-			data = malloc(newSize);
-			if (data) dataSize = newSize;
 		}
 	}