Fix corrupted INI file cause application crash (issue #144).

zufuliu · Nov 30, 2019 · febf552 · febf552
1 parent 92ad725
commit febf552
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 24 deletions.
diff --git a/metapath/src/Helpers.c b/metapath/src/Helpers.c
@@ -75,11 +75,15 @@ BOOL IniSectionParseArray(IniSection *section, LPWSTR lpCachedIniSection) {
 	do {
 		IniKeyValueNode *node = &section->nodeList[count];
 		LPWSTR v = StrChr(p, L'=');
-		*v++ = L'\0';
-		node->key = p;
-		node->value = v;
-		++count;
-		p = StrEnd(v) + 1;
+		if (v != NULL) {
+			*v++ = L'\0';
+			node->key = p;
+			node->value = v;
+			++count;
+			p = StrEnd(v) + 1;
+		} else {
+			p = StrDup(p) + 1;
+		}
 	} while (*p && count < capacity);
 
 	section->count = count;
@@ -99,13 +103,17 @@ BOOL IniSectionParse(IniSection *section, LPWSTR lpCachedIniSection) {
 	do {
 		IniKeyValueNode *node = &section->nodeList[count];
 		LPWSTR v = StrChr(p, L'=');
-		*v++ = L'\0';
-		const UINT keyLen = (UINT)(v - p - 1);
-		node->hash = keyLen | (p[0] << 8) | (p[1] << 16);
-		node->key = p;
-		node->value = v;
-		++count;
-		p = StrEnd(v) + 1;
+		if (v != NULL) {
+			*v++ = L'\0';
+			const UINT keyLen = (UINT)(v - p - 1);
+			node->hash = keyLen | (p[0] << 8) | (p[1] << 16);
+			node->key = p;
+			node->value = v;
+			++count;
+			p = StrEnd(v) + 1;
+		} else {
+			p = StrEnd(p) + 1;
+		}
 	} while (*p && count < capacity);
 
 	section->count = count;

diff --git a/src/Helpers.c b/src/Helpers.c
@@ -102,11 +102,15 @@ BOOL IniSectionParseArray(IniSection *section, LPWSTR lpCachedIniSection) {
 	do {
 		IniKeyValueNode *node = &section->nodeList[count];
 		LPWSTR v = StrChr(p, L'=');
-		*v++ = L'\0';
-		node->key = p;
-		node->value = v;
-		++count;
-		p = StrEnd(v) + 1;
+		if (v != NULL) {
+			*v++ = L'\0';
+			node->key = p;
+			node->value = v;
+			++count;
+			p = StrEnd(v) + 1;
+		} else {
+			p = StrEnd(p) + 1;
+		}
 	} while (*p && count < capacity);
 
 	section->count = count;
@@ -126,13 +130,17 @@ BOOL IniSectionParse(IniSection *section, LPWSTR lpCachedIniSection) {
 	do {
 		IniKeyValueNode *node = &section->nodeList[count];
 		LPWSTR v = StrChr(p, L'=');
-		*v++ = L'\0';
-		const UINT keyLen = (UINT)(v - p - 1);
-		node->hash = keyLen | (p[0] << 8) | (p[1] << 16);
-		node->key = p;
-		node->value = v;
-		++count;
-		p = StrEnd(v) + 1;
+		if (v != NULL) {
+			*v++ = L'\0';
+			const UINT keyLen = (UINT)(v - p - 1);
+			node->hash = keyLen | (p[0] << 8) | (p[1] << 16);
+			node->key = p;
+			node->value = v;
+			++count;
+			p = StrEnd(v) + 1;
+		} else {
+			p = StrEnd(p) + 1;
+		}
 	} while (*p && count < capacity);
 
 	section->count = count;