diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-10-11 09:17:51 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-10-11 09:17:51 +0100 |
| commit | b258a7d9c8f71669df3273127c076e722573f707 (patch) | |
| tree | ff6d87fffb1e1154da9dfadaddab8376eea2f96f /src/input | |
| parent | c7f63d6c87d5023ba65e3588bf37326e69b20430 (diff) | |
| parent | 61087cfdd20dfabcbc1da7fd11f85815f9a667aa (diff) | |
| download | xine-lib-b258a7d9c8f71669df3273127c076e722573f707.tar.gz xine-lib-b258a7d9c8f71669df3273127c076e722573f707.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/xine-engine/post.h => include/xine/post.h
rename : po/libxine1.pot => po/libxine2.pot
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/http_helper.h | 5 | ||||
| -rw-r--r-- | src/input/input_cdda.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/input/http_helper.h b/src/input/http_helper.h index 7ca3ac150..e53ccbe88 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 <xine/attributes.h> + /* * user agent finder, using modified protcol names * {proto}://... @@ -53,8 +55,9 @@ int _x_parse_url (char *url, char **proto, char** host, int *port, * * return: * the canonicalised URL (caller must free() it) + * NULL if error */ -static inline char *_x_canonicalise_url (const char *base, const char *url) { +static inline XINE_MALLOC char *_x_canonicalise_url (const char *base, const char *url) { size_t base_length; char *cut, *ret; diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 568e021f5..61528fea5 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -2507,6 +2507,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); |