mirror/libowfat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scan_jsonescape ends when it sees an unescaped "

Browse Source
This commit is contained in:
leitner 2017-03-13 13:46:37 +00:00
parent da2a8332fe
commit 3c68ae0dcc
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
View File

@ -225,7 +225,7 @@ install-man:
install -d $(DESTDIR)$(MAN3DIR) install -d $(DESTDIR)$(MAN3DIR)
install -m 644 $(wildcard */*.3) $(DESTDIR)$(MAN3DIR) install -m 644 $(wildcard */*.3) $(DESTDIR)$(MAN3DIR)
install: install-inc install-man install-lib install: headers install-inc install-man install-lib
uninstall: uninstall:
rm -f $(patsubst %.h,$(INCLUDEDIR)/%.h,$(INCLUDES)) rm -f $(patsubst %.h,$(INCLUDEDIR)/%.h,$(INCLUDES))

4
textcode/scan_jsonescape.c
View File

@ -11,6 +11,9 @@ size_t scan_jsonescape(const char *src,char *dest,size_t *destlen) {
for (i=0; s[i]; ++i) { for (i=0; s[i]; ++i) {
if ((c=s[i])=='\\') { if ((c=s[i])=='\\') {
switch (s[i+1]) { switch (s[i+1]) {
case '"':
if (prev!=(unsigned int)-1) return 0; // lead surrogate not followed by tail surrogate
goto done;
case '\\': case '\\':
if (prev!=(unsigned int)-1) return 0; // lead surrogate not followed by tail surrogate if (prev!=(unsigned int)-1) return 0; // lead surrogate not followed by tail surrogate
// c='\\'; // c already is backslash // c='\\'; // c already is backslash
@ -54,6 +57,7 @@ size_t scan_jsonescape(const char *src,char *dest,size_t *destlen) {
if (dest) dest[written]=c; if (dest) dest[written]=c;
++written; ++written;
} }
done:
*destlen=written; *destlen=written;
return i; return i;
} }