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);
}
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);
-
- for (hashIndex = 0; hashIndex < 16; hashIndex++, tempBuffer += 2) {
- sscanf(tempBuffer, "%hhx", hash + hashIndex);
+ free(sizeString);
+
+ for (hashIndex = 0; hashIndex < 16; hashIndex++) {
+ char byteBuffer[3];
+ byteBuffer[2] = '\0';
+ memcpy(byteBuffer, tempBuffer + hashIndex * 2, 2);
+ 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() {