aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2025-05-18 00:58:26 -04:00
Code

some xslt related fixes. A small memory leak, a socket not closing on odd

Browse Source 
case, and truncate the buffer length so that junk chars are not sent back.

svn path=/icecast/trunk/icecast/; revision=9547
This commit is contained in:
Karl Heyes 2005-07-04 20:11:15 +00:00
parent efd3692202
commit 6ccda03842
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/stats.c
View File

@ -897,6 +897,7 @@ void stats_transform_xslt(client_t *client, const char *uri)
xslt_transform(doc, xslpath, client); xslt_transform(doc, xslpath, client);
xmlFreeDoc(doc); xmlFreeDoc(doc);
free (xslpath);
} }
void stats_get_xml(xmlDocPtr *doc, int show_hidden) void stats_get_xml(xmlDocPtr *doc, int show_hidden)

19
src/xslt.c
View File

@ -156,7 +156,7 @@ void xslt_transform(xmlDocPtr doc, const char *xslfilename, client_t *client)
xmlDocPtr res; xmlDocPtr res;
xsltStylesheetPtr cur; xsltStylesheetPtr cur;
xmlChar *string; xmlChar *string;
int len; int len, problem = 0;
thread_mutex_lock(&xsltlock); thread_mutex_lock(&xsltlock);
cur = xslt_get_stylesheet(xslfilename); cur = xslt_get_stylesheet(xslfilename);
@ -171,19 +171,28 @@ void xslt_transform(xmlDocPtr doc, const char *xslfilename, client_t *client)
res = xsltApplyStylesheet(cur, doc, NULL); res = xsltApplyStylesheet(cur, doc, NULL);
xsltSaveResultToString (&string, &len, res, cur); if (xsltSaveResultToString (&string, &len, res, cur) < 0)
problem = 1;
thread_mutex_unlock(&xsltlock); thread_mutex_unlock(&xsltlock);
if (string) if (problem == 0)
{ {
const char *http = "HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nContent-Length: "; const char *http = "HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nContent-Length: ";
unsigned buf_len = strlen (http) + 20 + len; int buf_len = strlen (http) + 20 + len;
if (string == NULL)
string = xmlStrdup ("");
client->respcode = 200; client->respcode = 200;
client->refbuf = refbuf_new (buf_len); client->refbuf = refbuf_new (buf_len);
snprintf (client->refbuf->data, buf_len, "%s%d\r\n\r\n%s", http, len, string); len = snprintf (client->refbuf->data, buf_len, "%s%d\r\n\r\n%s", http, len, string);
client->refbuf->len = len;
fserve_add_client (client, NULL); fserve_add_client (client, NULL);
xmlFree (string); xmlFree (string);
} }
else
{
WARN1 ("problem applying stylesheet \"%s\"", xslfilename);
client_send_404 (client, "XSLT problem");
}
xmlFreeDoc(res); xmlFreeDoc(res);
} }