MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix format string problems in rsp.c

This commit is contained in:
Ron Pedde 2006-05-29 07:37:00 +00:00
parent 54be2c1c41
commit b9e14d22ed
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/rsp.c
View File

@ -260,13 +260,13 @@ void rsp_info(WS_CONNINFO *pwsc, PRIVINFO *ppi) {
/* info block */ /* info block */
xml_push(pxml,"info"); xml_push(pxml,"info");
xml_output(pxml,"count","%d",_ppi->db_count()); xml_output(pxml,"count","%d",_ppi->db_count());
xml_output(pxml,"rsp-version",RSP_VERSION); xml_output(pxml,"rsp-version","%s",RSP_VERSION);
xml_output(pxml,"server-version",_ppi->server_ver()); xml_output(pxml,"server-version","%s",_ppi->server_ver());
size = sizeof(servername); size = sizeof(servername);
_ppi->server_name(servername,&size); _ppi->server_name(servername,&size);
xml_output(pxml,"name",servername); xml_output(pxml,"name","%s",servername);
xml_pop(pxml); /* info */ xml_pop(pxml); /* info */
xml_pop(pxml); /* response */ xml_pop(pxml); /* response */
@ -517,7 +517,7 @@ void rsp_browse(WS_CONNINFO *pwsc, PRIVINFO *ppi) {
xml_push(pxml,"items"); xml_push(pxml,"items");
while((_ppi->db_enum_fetch_row(NULL,&row,&ppi->dq) == 0) && (row)) { while((_ppi->db_enum_fetch_row(NULL,&row,&ppi->dq) == 0) && (row)) {
xml_output(pxml,"item",row[0]); xml_output(pxml,"item","%s",row[0]);
} }
_ppi->db_enum_end(NULL); _ppi->db_enum_end(NULL);

6
src/plugins/xml-rpc.c
View File

@ -296,6 +296,7 @@ void xml_output(XMLSTRUCT *pxml, char *section, char *fmt, ...) {
if(section) { if(section) {
xml_push(pxml,section); xml_push(pxml,section);
} }
_ppi->log(E_DBG,"Converting %s -> %s\n",buf,output);
xml_write(pxml,"%s",output); xml_write(pxml,"%s",output);
free(output); free(output);
if(section) { if(section) {
@ -373,6 +374,11 @@ char *xml_entity_encode(char *original) {
d += 5; d += 5;
s++; s++;
break; break;
case '%':
strcat(d,"%");
d += 5;
s++;
break;
default: default:
*d++ = *s++; *d++ = *s++;
} }