X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ED2KLink.cpp;h=1a8206651f7edc5ff258c1bafb431db6eef2bc3e;hb=87c3276013058baf0a606510737ae03ae1c79727;hp=0e633a466a2dcf2d4f78e2b402d6ccd463e46898;hpb=7182eee63bf7ce0fa946f3bd0060af7770f13256;p=ecparse.git

diff --git a/ED2KLink.cpp b/ED2KLink.cpp
index 0e633a4..1a82066 100644
--- a/ED2KLink.cpp
+++ b/ED2KLink.cpp
@@ -53,7 +53,8 @@ ED2KLink* ED2KLink::parseED2KLink(const char* buffer) {
 	char* sizeString;
 	size_t size;
 	int hashIndex;
-	char hash[16];
+	unsigned char hash[16];
+	char* pipeIndex;
 	GrowingBuffer growingBuffer;
 
 	GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] trying to parse “%s”...\n", __FILE__, __LINE__, buffer);
@@ -63,29 +64,39 @@ 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());
 	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());
 	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);
 
-	for (hashIndex = 0; hashIndex < 16; hashIndex++, tempBuffer += 2) {
-		sscanf(tempBuffer, "%hhx", hash + hashIndex);
+	for (hashIndex = 0; hashIndex < 16; hashIndex++) {
+		char byteBuffer[3];
+		byteBuffer[2] = '\0';
+		memcpy(byteBuffer, tempBuffer + hashIndex * 2, 2);
+		sscanf(byteBuffer, "%hhX", &hash[hashIndex]);
+		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);