stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #415 from dmarion/osx

Browse source 
avahi: tvheadend_webroot can be NULL - fix the fix
This commit is contained in:
perexg 2014-06-02 19:56:08 +02:00
commit 385c19019c
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/avahi.c
View file

@ -152,7 +152,7 @@ create_services(AvahiClient *c)
path = malloc(strlen(tvheadend_webroot) + 6); path = malloc(strlen(tvheadend_webroot) + 6);
sprintf(path, "path=%s", tvheadend_webroot); sprintf(path, "path=%s", tvheadend_webroot);
} else { } else {
path = "/"; path = strdup("path=/");
} }
/* Add the service for HTTP */ /* Add the service for HTTP */
@ -162,8 +162,7 @@ create_services(AvahiClient *c)
path, path,
NULL)) < 0) { NULL)) < 0) {
if (tvheadend_webroot) free(path);
free(path);
if (ret == AVAHI_ERR_COLLISION) if (ret == AVAHI_ERR_COLLISION)
goto collision; goto collision;