commit cd3302e37ee151f0ef85de20da7ccd7c472ed7b7
author Josh Coalson <jcoalson@users.sourceforce.net> Tue Nov 21 08:27:59 2006 +0000
committer Josh Coalson <jcoalson@users.sourceforce.net> Tue Nov 21 08:27:59 2006 +0000
tree e7e771f46e19fb98c9cc0f4074ae6d45c7d739f1
parent 2c93a742460da93cc36491b762fa4a86847e12b5

fix bug where jpeg marker detection could be broken by non-C locale

src/share/grabbag/picture.c

diff --git a/src/share/grabbag/picture.c b/src/share/grabbag/picture.c
index 4ef00d8..09cb65c 100644
--- a/src/share/grabbag/picture.c
+++ b/src/share/grabbag/picture.c
@@ -191,7 +191,7 @@
 			if(*data == 0xda || *data == 0xd9)
 				return false;
 			/* looking for some SOFn */
-			else if(strchr("\xc0\xc1\xc2\xc3\xc5\xc6\xc7\xc9\xca\xcb\xcd\xce\xcf", *data)) {
+			else if(memchr("\xc0\xc1\xc2\xc3\xc5\xc6\xc7\xc9\xca\xcb\xcd\xce\xcf", *data, 13)) {
 				data++; len--; /* skip marker byte */
 				if(len < 2)
 					return false;