diff options
| -rw-r--r-- | xine_fbfe_frontend.c | 17 | ||||
| -rw-r--r-- | xine_frontend.c | 12 | ||||
| -rw-r--r-- | xine_frontend_main.c | 14 | ||||
| -rw-r--r-- | xine_input_vdr.c | 12 |
4 files changed, 35 insertions, 20 deletions
diff --git a/xine_fbfe_frontend.c b/xine_fbfe_frontend.c index 694f76c5..5fdf804c 100644 --- a/xine_fbfe_frontend.c +++ b/xine_fbfe_frontend.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_fbfe_frontend.c,v 1.40 2008-11-14 23:46:57 phintuka Exp $ + * $Id: xine_fbfe_frontend.c,v 1.41 2008-11-16 15:27:54 rofafor Exp $ * */ @@ -85,10 +85,16 @@ static void update_DFBARGS(const char *fb_dev) head = NULL; else *head = 0; - asprintf(&env_new, "%sfbdev=%s%s", - head ? env_tmp : "", fb_dev, tail ? tail : ""); + if(asprintf(&env_new, "%sfbdev=%s%s", + head ? env_tmp : "", fb_dev, tail ? tail : "") < 0) { + free(env_tmp); + return; + } } else { - asprintf(&env_new, "fbdev=%s%s%s", fb_dev, env_tmp ? "," : "", env_tmp ?: ""); + if(asprintf(&env_new, "fbdev=%s%s%s", fb_dev, env_tmp ? "," : "", env_tmp ?: "") < 0) { + free(env_tmp); + return; + } } free(env_tmp); @@ -96,7 +102,8 @@ static void update_DFBARGS(const char *fb_dev) env_new, env_old); } else { - asprintf(&env_new, "fbdev=%s", fb_dev); + if(asprintf(&env_new, "fbdev=%s", fb_dev) < 0) + return; LOGMSG("setting environment variable DFBARGS to %s", env_new); } diff --git a/xine_frontend.c b/xine_frontend.c index e3cb43fb..96f9640f 100644 --- a/xine_frontend.c +++ b/xine_frontend.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_frontend.c,v 1.89 2008-11-16 00:08:31 phintuka Exp $ + * $Id: xine_frontend.c,v 1.90 2008-11-16 15:27:54 rofafor Exp $ * */ @@ -556,9 +556,10 @@ static int fe_xine_init(frontend_t *this_gen, const char *audio_driver, free(this->configfile); this->configfile = NULL; - asprintf(&this->configfile, - "%s%s", xine_get_homedir(), - "/.xine/config_xineliboutput"); + if(asprintf(&this->configfile, "%s%s", xine_get_homedir(), + "/.xine/config_xineliboutput") < 0) + return 0; + xine_config_load (this->xine, this->configfile); x_reg_num ("engine.buffers.video_num_buffers", @@ -737,7 +738,8 @@ static int fe_xine_open(frontend_t *this_gen, const char *mrl) this->playback_finished = 1; this->terminate_key_pressed = 0; - asprintf(&url, "%s#nocache;demux:mpeg_block", mrl ? : MRL_ID "://"); + if(asprintf(&url, "%s#nocache;demux:mpeg_block", mrl ? : MRL_ID "://") < 0) + return 0; result = xine_open(this->stream, url); diff --git a/xine_frontend_main.c b/xine_frontend_main.c index 5f767560..aaee9f36 100644 --- a/xine_frontend_main.c +++ b/xine_frontend_main.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_frontend_main.c,v 1.60 2008-11-15 13:52:25 phintuka Exp $ + * $Id: xine_frontend_main.c,v 1.61 2008-11-16 15:27:54 rofafor Exp $ * */ @@ -510,10 +510,13 @@ int main(int argc, char *argv[]) if(mrl) { char *tmp = mrl; mrl = NULL; - asprintf(&mrl, "%s//%s:%d", tmp, address, port); - free(tmp); + if(asprintf(&mrl, "%s//%s:%d", tmp, address, port) < 0) { + free(tmp); + return -1; + } } else - asprintf(&mrl, MRL_ID "://%s:%d", address, port); + if(asprintf(&mrl, MRL_ID "://%s:%d", address, port) < 0) + return -1; } else { PRINTF("---------------------------------------------------------------\n" "WARNING: MRL not given and server not found from local network.\n" @@ -528,7 +531,8 @@ int main(int argc, char *argv[]) strncmp(mrl, MRL_ID "+", MRL_ID_LEN+1)) { char *mrl2 = mrl; PRINTF("WARNING: MRL does not start with \'" MRL_ID ":\' (%s)", mrl); - asprintf(&mrl, MRL_ID "://%s", mrl); + if(asprintf(&mrl, MRL_ID "://%s", mrl) < 0) + return -1; free(mrl2); } diff --git a/xine_input_vdr.c b/xine_input_vdr.c index f15b69fe..fd1056fb 100644 --- a/xine_input_vdr.c +++ b/xine_input_vdr.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_input_vdr.c,v 1.194 2008-11-16 15:02:45 rofafor Exp $ + * $Id: xine_input_vdr.c,v 1.195 2008-11-16 15:27:54 rofafor Exp $ * */ @@ -1588,7 +1588,8 @@ static void queue_nosignal(vdr_input_plugin_t *this) return; } - asprintf(&home,"%s/.xine/nosignal.mpg", xine_get_homedir()); + if(asprintf(&home,"%s/.xine/nosignal.mpg", xine_get_homedir()) < 0) + return; int fd = open(path=home, O_RDONLY); if(fd<0) fd = open(path="/etc/vdr/plugins/xineliboutput/nosignal.mpg", O_RDONLY); if(fd<0) fd = open(path="/etc/vdr/plugins/xine/noSignal.mpg", O_RDONLY); @@ -2648,9 +2649,10 @@ static void send_meta_info(vdr_input_plugin_t *this) char *album = (char *)xine_get_meta_info(this->slave_stream, XINE_META_INFO_ALBUM); char *tracknumber = (char *)xine_get_meta_info(this->slave_stream, XINE_META_INFO_TRACK_NUMBER); - asprintf(&meta, + if(asprintf(&meta, "INFO METAINFO title=@%s@ artist=@%s@ album=@%s@ tracknumber=@%s@\r\n", - title?:"", artist?:"", album?:"", tracknumber?:""); + title?:"", artist?:"", album?:"", tracknumber?:"") < 0) + return; if(this->fd_control < 0) this->funcs.xine_input_event(meta, NULL); @@ -3939,7 +3941,7 @@ static void slave_track_maps_changed(vdr_input_plugin_t *this) this->funcs.xine_input_event(tracks, NULL); else write_control(this, tracks); - LOGDBG(tracks); + LOGDBG("%s", tracks); } #endif |