hummypkg/tvdb
4
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

df-xmldecode-patch #1

Merged
af123 merged 3 commits from df/tvdb:df-xmldecode-patch into master 2021-01-18 22:57:11 +00:00
Conversation 2 Commits 3 Files Changed 2 +19 -11
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -9,7 +9,7 @@ HDRS=
OBJS= $(SRCS:.c=.o)
CC=gcc
#CC=mipsel-linux-gcc
CFLAGS=-g
CFLAGS=-g -std=c99 -D_XOPEN_SOURCE=700
INCS=
LIBS=-lsqlite3
WARN=-pedantic -Wall -W -Wnested-externs -Wpointer-arith -Wno-long-long

28
tvdb.c
View File

@ -51,23 +51,31 @@ unescape(char *txt)
char *p = txt;
int l = strlen(txt);
while ((p = strchr(p, '&')))
for (; (p = strchr(p, '&')); p++)
{
HANDLE(""", '"', 5);
HANDLE("&", '&', 4);
HANDLE("
", '\n', 4);
HANDLE("
", '\r', 4);
p++;
int ll = 0;
unsigned char icode;
/* sscanf -> 1: the code was read; ll>0: ';' came next */
if ((1 == sscanf( p, "&#%hhu;%n", &icode, &ll) ||
1 == sscanf( p, "&#%*[xX]%hhx;%n", &icode, &ll)) &&
ll > 0) {
af123 marked this conversation as resolved
af123 commented 2021-01-16 21:27:41 +00:00
Review
Copy Link

sscanf() will return 2 if two input items were converted, won't it?

`sscanf()` will return 2 if two input items were converted, won't it?
/* &#x<hex>;, &#<decimal>; */
HANDLE(p, (char)icode, ll-1);
} else {
HANDLE("&amp;", '&', 4);
HANDLE("&quot;", '"', 5);
HANDLE("&apos;", '\'', 5);
HANDLE("&lt;", '<', 3);
HANDLE("&gt;", '>', 3);
}
}
p = txt;
while ((p = memchr(p, '\xe2', l - (p - txt))))
{
for (p = txt; (p = memchr(p, '\xe2', l - (p - txt))); p++)
{ /* curly apostrophe, en dash, curly quotes */
HANDLE("\xe2\x80\x99", '\'', 2);
HANDLE("\xe2\x80\x93", '-', 2);
HANDLE("\xe2\x80\x9c", '"', 2);
HANDLE("\xe2\x80\x9d", '"', 2);
p++;
}
if ((p = strpbrk(txt, "\n\r")))