X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ED2KLink.cpp;h=47f3af8f0b8849a96728cf16e75bca1f592a16a3;hb=3cf3d0fbb0576ab0eaa3f9f0f0ca19d15192d0d0;hp=f6bcb50d8580a2ef6a71c4495982d45915dfdb13;hpb=5055ee4c17b480e213b3afb38184530da566bb60;p=ecparse.git

diff --git a/ED2KLink.cpp b/ED2KLink.cpp
index f6bcb50..47f3af8 100644
--- a/ED2KLink.cpp
+++ b/ED2KLink.cpp
@@ -54,6 +54,7 @@ ED2KLink* ED2KLink::parseED2KLink(const char* buffer) {
 	size_t size;
 	int hashIndex;
 	unsigned char hash[16];
+	char* pipeIndex;
 	GrowingBuffer growingBuffer;
 
 	GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] trying to parse “%s”...\n", __FILE__, __LINE__, buffer);
@@ -63,36 +64,50 @@ ED2KLink* ED2KLink::parseED2KLink(const char* buffer) {
 	}
 
 	tempBuffer += 13;
-	while (*tempBuffer != '|') {
-		growingBuffer.write(tempBuffer++, 1);
+	pipeIndex = strchr(tempBuffer, '|');
+	if (!pipeIndex) {
+		GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] expected pipe character (‘|’) but found none.\n", __FILE__, __LINE__);
+		return NULL;
 	}
+	growingBuffer.write(tempBuffer, (char*) pipeIndex - tempBuffer);
 	filename = (char*) malloc(growingBuffer.getLimit() + 1);
 	growingBuffer.read(filename, growingBuffer.getLimit());
+	sizeString[growingBuffer.getLimit()] = '\0';
 	growingBuffer.clear();
-	tempBuffer++;
+	tempBuffer = pipeIndex + 1;
 
 	GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] parsed filename: “%s”.\n", __FILE__, __LINE__, filename);
 
-	while (*tempBuffer != '|') {
-		growingBuffer.write(tempBuffer++, 1);
+	pipeIndex = strchr(tempBuffer, '|');
+	if (!pipeIndex) {
+		GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] expected pipe character (‘|’) but found none.\n", __FILE__, __LINE__);
+		return NULL;
 	}
+	growingBuffer.write(tempBuffer, (char*) pipeIndex - tempBuffer);
 	sizeString = (char*) malloc(growingBuffer.getLimit() + 1);
 	growingBuffer.read(sizeString, growingBuffer.getLimit());
+	sizeString[growingBuffer.getLimit()] = '\0';
 	growingBuffer.clear();
-	tempBuffer++;
+	tempBuffer = pipeIndex + 1;
 
 	size = atol(sizeString);
 	GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] parsed size “%s” into %d.\n", __FILE__, __LINE__, sizeString, size);
+	free(sizeString);
 
 	for (hashIndex = 0; hashIndex < 16; hashIndex++) {
 		char byteBuffer[3];
 		byteBuffer[2] = '\0';
 		memcpy(byteBuffer, tempBuffer + hashIndex * 2, 2);
-		sscanf(byteBuffer, "%hhX", &hash[hashIndex]);
+		if (sscanf(byteBuffer, "%hhX", &hash[hashIndex]) != 1) {
+			GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] could not parse ‘%c%c’ into a byte.\n", __FILE__, __LINE__, *(byteBuffer), *(byteBuffer + 1));
+			return NULL;
+		}
 		GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] parsed ‘%c%c’ as %02x.\n", __FILE__, __LINE__, *(byteBuffer), *(byteBuffer + 1), hash[hashIndex]);
 	}
 
-	return new ED2KLink(filename, size, hash);
+	ED2KLink* ed2kLink = new ED2KLink(filename, size, hash);
+	free(filename);
+	return ed2kLink;
 }
 
 const char* ED2KLink::getLink() {