From 5a328ea1e80e6aed413fc41a74975e63481a3d02 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Thu, 4 Oct 2012 00:02:51 +0200 Subject: [PATCH] libeplayer3: fix invalid free() 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: https://github.com/neutrino-images/ni-libstb-hal/commit/67dc685e612b494d0646c97eb58728f6980e3ca5 Author: Stefan Seyfried Date: 2012-10-04 (Thu, 04 Oct 2012) ------------------ This commit was generated by Migit --- libeplayer3/container/text_srt.c | 10 +++++----- libeplayer3/container/text_ssa.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libeplayer3/container/text_srt.c b/libeplayer3/container/text_srt.c index 6717a90..71c71d9 100644 --- a/libeplayer3/container/text_srt.c +++ b/libeplayer3/container/text_srt.c @@ -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; } diff --git a/libeplayer3/container/text_ssa.c b/libeplayer3/container/text_ssa.c index ec59fb3..c970c2e 100644 --- a/libeplayer3/container/text_ssa.c +++ b/libeplayer3/container/text_ssa.c @@ -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; }