From 87c3276013058baf0a606510737ae03ae1c79727 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sat, 5 Jul 2008 21:02:35 +0200 Subject: [PATCH] improve parsing --- ED2KLink.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/ED2KLink.cpp b/ED2KLink.cpp index f6bcb50..1a82066 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,23 +64,29 @@ 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); -- 2.7.4