aniani/ezstream
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/ezstream.git synced 2025-02-02 15:07:45 -05:00
Code

Hmph. I've been stepping into the copy-of-pointer trap twice now. Fix it again.

Browse Source 
git-svn-id: https://svn.xiph.org/trunk/ezstream@12681 0101bb08-14d6-0310-b084-bc0e0c8e3800
This commit is contained in:
moritz 2007-03-08 15:25:33 +00:00
parent 900886ab3f
commit 832c21def2
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ezstream.c
View File

@ -297,12 +297,12 @@ processMetadata(shout_t *shout, const char *fileName)
} }
if (!metadata_file_update(mdata)) { if (!metadata_file_update(mdata)) {
metadata_free(mdata); metadata_free(&mdata);
songInfo = xstrdup(blankString); songInfo = xstrdup(blankString);
return (songInfo); return (songInfo);
} }
songInfo = xstrdup(metadata_get_string(mdata)); songInfo = xstrdup(metadata_get_string(mdata));
metadata_free(mdata); metadata_free(&mdata);
if ((shout_mdata = shout_metadata_new()) == NULL) { if ((shout_mdata = shout_metadata_new()) == NULL) {
printf("%s: shout_metadata_new(): %s\n", __progname, printf("%s: shout_metadata_new(): %s\n", __progname,

18
src/metadata.c
View File

@ -337,7 +337,7 @@ metadata_file(const char *filename)
md = metadata_create(filename); md = metadata_create(filename);
if (!metadata_file_update(md)) { if (!metadata_file_update(md)) {
metadata_free(md); metadata_free(&md);
return (NULL); return (NULL);
} }
@ -362,15 +362,19 @@ metadata_program(const char *program)
} }
void void
metadata_free(metadata_t *md) metadata_free(metadata_t **md)
{ {
if (md == NULL) metadata_t *tmp;
if (md == NULL || *md == NULL)
return; return;
if (md->filename != NULL) tmp = *md;
xfree(md->filename);
metadata_clean_md(md); if (tmp->filename != NULL)
xfree(md); xfree(tmp->filename);
metadata_clean_md(tmp);
xfree(*md);
} }

2
src/metadata.h
View File

@ -59,7 +59,7 @@ metadata_t * metadata_program(const char * /* program name */);
* Free all memory used by a metadata handle that has been created with * Free all memory used by a metadata handle that has been created with
* metadata_file() or metadata_program(). * metadata_file() or metadata_program().
*/ */
void metadata_free(metadata_t *); void metadata_free(metadata_t **);
/* /*
* Update/read the metadata for the given handle. Returns 1 on success, and 0 * Update/read the metadata for the given handle. Returns 1 on success, and 0