From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sat, 5 Jul 2008 19:07:09 +0000 (+0200)
Subject: recognize faulty hash
X-Git-Tag: 0.1~26
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=0660d2d3d6f00d0c57d373893cc375408adc155f;p=ecparse.git

recognize faulty hash
---

diff --git a/ED2KLink.cpp b/ED2KLink.cpp
index e1ec2ff..05b8d97 100644
--- a/ED2KLink.cpp
+++ b/ED2KLink.cpp
@@ -96,7 +96,10 @@ ED2KLink* ED2KLink::parseED2KLink(const char* buffer) {
 		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]);
 	}