"Fixed" a quasibug in parseIllustrationPathToSize()

veloman-yunkan · veloman-yunkan · commit 36592f810e08 · 2025-06-13T18:59:24.000+04:00
There was an extra character in the format string of the sscanf.
diff --git a/src/tools.cpp b/src/tools.cpp
@@ -111,7 +111,7 @@ unsigned int zim::parseIllustrationPathToSize(const std::string& s)
 {
   int nw(0), nh(0), nEnd(0);
   long int w(-1), h(-1);
-  if ( sscanf(s.c_str(), "Illustration_%n%ldx%n%ld@1%n)", &nw, &w, &nh, &h, &nEnd) == 2
+  if ( sscanf(s.c_str(), "Illustration_%n%ldx%n%ld@1%n", &nw, &w, &nh, &h, &nEnd) == 2
      && (size_t)nEnd == s.size() && !isspace(s[nw]) && !isspace(s[nh]) && w == h && w >= 0) {
     return (unsigned int)w;
   }

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ unsigned int zim::parseIllustrationPathToSize(const std::string& s)`
`111`	`111`	`{`
`112`	`112`	`int nw(0), nh(0), nEnd(0);`
`113`	`113`	`long int w(-1), h(-1);`
`114`		`- if ( sscanf(s.c_str(), "Illustration_%n%ldx%n%ld@1%n)", &nw, &w, &nh, &h, &nEnd) == 2`
	`114`	`+ if ( sscanf(s.c_str(), "Illustration_%n%ldx%n%ld@1%n", &nw, &w, &nh, &h, &nEnd) == 2`
`115`	`115`	`&& (size_t)nEnd == s.size() && !isspace(s[nw]) && !isspace(s[nh]) && w == h && w >= 0) {`
`116`	`116`	`return (unsigned int)w;`
`117`	`117`	`}`