[commit] r1600 - trunk/GME/Mga

[GMESRC Repository Notifications]

Author: ksmyth
Date: Tue Oct 11 10:11:50 2011
New Revision: 1600

Log:
Fix AV in end = wcschr(begin, ") with input=Atom1

Modified:
   trunk/GME/Mga/MgaFilter.cpp

Modified: trunk/GME/Mga/MgaFilter.cpp
==============================================================================
--- trunk/GME/Mga/MgaFilter.cpp	Tue Oct 11 10:11:28 2011	(r1599)
+++ trunk/GME/Mga/MgaFilter.cpp	Tue Oct 11 10:11:50 2011	(r1600)
@@ -87,11 +87,12 @@
 		wchar_t *finish = name + wcslen(name);
 		bool inquotes = false;
 		wchar_t *begin = name;
-		wchar_t *end = wcschr(begin, L'\"');
-		if (!end) {
-			end = finish;
-		}
+		wchar_t *end;
 		while (begin < finish) {
+			end = wcschr(begin, L'\"');
+			if (!end) {
+				end = finish;
+			}
 			*end = L'\0';
 			if (inquotes) {
 				names.insert(CComBSTR(begin));
@@ -104,10 +105,6 @@
 				inquotes = true;
 			}
 			begin = end + 1;
-			end = wcschr(begin, L'\"');
-			if (!end) {
-				end = finish;
-			}
 		}
 
 		MGA_TRACE("Names at init");