From a90bf52de3bac83e9e1708671d26c9f4ad889b3f Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Mon, 10 Oct 2011 00:32:30 +0300 Subject: Marked _x_canonicalise_url() with XINE_MALLOC attribute --- src/input/http_helper.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/input') diff --git a/src/input/http_helper.h b/src/input/http_helper.h index 68299a2ea..fbbe3a6c4 100644 --- a/src/input/http_helper.h +++ b/src/input/http_helper.h @@ -23,6 +23,8 @@ #ifndef HTTP_HELPER_H #define HTTP_HELPER_H +#include "attributes.h" + /* * user agent finder, using modified protcol names * {proto}://... @@ -53,7 +55,8 @@ int _x_parse_url (char *url, char **proto, char** host, int *port, * * return: * the canonicalised URL (caller must free() it) + * NULL if error */ -char *_x_canonicalise_url (const char *base, const char *url); +char *_x_canonicalise_url (const char *base, const char *url) XINE_MALLOC; #endif /* HTTP_HELPER_H */ -- cgit v1.2.3 From 61087cfdd20dfabcbc1da7fd11f85815f9a667aa Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Mon, 10 Oct 2011 12:37:28 +0300 Subject: input_cdda: fixed writing outside of table --- src/input/input_cdda.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/input') diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 052a1b257..b2a4b117e 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -2649,6 +2649,8 @@ static char ** cdda_class_get_autoplay_list (input_class_t *this_gen, num_tracks = toc->last_track - toc->first_track; if (toc->ignore_last_track) num_tracks--; + if (num_tracks >= MAX_TRACKS-1) + num_tracks = MAX_TRACKS - 2; for ( i = 0; i <= num_tracks; i++ ) asprintf(&this->autoplaylist[i],"cdda:/%d",i+toc->first_track); -- cgit v1.2.3