mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 15:02:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

libeplayer3: fix invalid free()

Browse Source 
according to the man pages....
* dirname() can not return NULL
* the pointer returned by dirname must not be free()d
* strdup() can return NULL


Origin commit data
------------------
Branch: master
Commit: 67dc685e61
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-04 (Thu, 04 Oct 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-10-04 00:02:51 +02:00
parent 6b29558dc9
commit 5a328ea1e8
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libeplayer3/container/text_srt.c
View File

@@ -290,14 +290,14 @@ static int SrtGetSubtitle(Context_t *context, char * Filename) {
copyFilename = strdup(Filename);
FilenameFolder = dirname(copyFilename);
if (FilenameFolder == NULL)
if (copyFilename == NULL)
{
srt_err("FilenameFolder NULL\n");
srt_err("copyFilename NULL\n");
return cERR_SRT_ERROR;
}
FilenameFolder = dirname(copyFilename);
srt_printf(10, "folder: %s\n", FilenameFolder);
getExtension(copyFilename, &FilenameExtension);
@@ -305,7 +305,7 @@ static int SrtGetSubtitle(Context_t *context, char * Filename) {
if (FilenameExtension == NULL)
{
srt_err("FilenameExtension NULL\n");
free(FilenameFolder);
free(copyFilename);
return cERR_SRT_ERROR;
}

10
libeplayer3/container/text_ssa.c
View File

@@ -291,14 +291,14 @@ static int SsaGetSubtitle(Context_t *context, char * Filename) {
copyFilename = strdup(Filename);
FilenameFolder = dirname(copyFilename);
if (FilenameFolder == NULL)
if (copyFilename == NULL)
{
ssa_err("FilenameFolder NULL\n");
ssa_err("copyFilename NULL\n");
return cERR_SSA_ERROR;
}
FilenameFolder = dirname(copyFilename);
ssa_printf(10, "folder: %s\n", FilenameFolder);
getExtension(copyFilename, &FilenameExtension);
@@ -306,7 +306,7 @@ static int SsaGetSubtitle(Context_t *context, char * Filename) {
if (FilenameExtension == NULL)
{
ssa_err("FilenameExtension NULL\n");
free(FilenameFolder);
free(copyFilename);
return cERR_SSA_ERROR;
}