From efcb6216fad91fb8a71aa7aff4c8b3b055e2cb69 Mon Sep 17 00:00:00 2001 From: Joachim Wilke Date: Sat, 1 Jan 2011 16:58:38 +0100 Subject: Fix compiler warnings - Added several asprintfs result checks - Fixed a sprintf call --- lcdproc.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'lcdproc.c') diff --git a/lcdproc.c b/lcdproc.c index 4ce0385..ff55b99 100644 --- a/lcdproc.c +++ b/lcdproc.c @@ -121,7 +121,10 @@ void cLcdFeed::SetAudioTrack(int Index, const char * const *Tracks) OsdTitle(trVDR("Button$Audio")); if (AudioTrack) free(AudioTrack); - asprintf(&AudioTrack, "%s", Tracks[Index]); + if (asprintf(&AudioTrack, "%s", Tracks[Index]) < 0) { + syslog(LOG_ERR, "lcdproc: error allocating memory in asprintf"); + return; + } OsdCurrentItem(AudioTrack); } @@ -129,13 +132,22 @@ void cLcdFeed::SetAudioChannel(int AudioChannel){ char * TrackDescription; switch (AudioChannel){ case 0: - asprintf(&TrackDescription, "%s (%s)", AudioTrack, tr("Stereo")); + if (asprintf(&TrackDescription, "%s (%s)", AudioTrack, tr("Stereo")) < 0) { + syslog(LOG_ERR, "lcdproc: error allocating memory in asprintf"); + return; + } break; case 1: - asprintf(&TrackDescription, "%s (%s)", AudioTrack, tr("Left channel")); + if (asprintf(&TrackDescription, "%s (%s)", AudioTrack, tr("Left channel")) < 0) { + syslog(LOG_ERR, "lcdproc: error allocating memory in asprintf"); + return; + } break; case 2: - asprintf(&TrackDescription, "%s (%s)", AudioTrack, tr("Right channel")); + if (asprintf(&TrackDescription, "%s (%s)", AudioTrack, tr("Right channel")) < 0) { + syslog(LOG_ERR, "lcdproc: error allocating memory in asprintf"); + return; + } break; default: return; -- cgit v1.2.3