diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-19 01:09:39 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-19 01:09:39 +0100 |
| commit | fedec814a0af828f9c4e97ed49cdb727e0d64ad0 (patch) | |
| tree | 6614288d9f0937b640d0efcb757a6ea13bac7a6d /src/input/http_helper.c | |
| parent | 5c2f96797e1ad0c9e1e930fd86941fcec27abdc4 (diff) | |
| parent | 64596f317f7d03ed1f3e747cd2b0664b1d4f6535 (diff) | |
| download | xine-lib-fedec814a0af828f9c4e97ed49cdb727e0d64ad0.tar.gz xine-lib-fedec814a0af828f9c4e97ed49cdb727e0d64ad0.tar.bz2 | |
Merge from 1.2 branch.
Diffstat (limited to 'src/input/http_helper.c')
| -rw-r--r-- | src/input/http_helper.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/input/http_helper.c b/src/input/http_helper.c index 4883763b0..279d3ff05 100644 --- a/src/input/http_helper.c +++ b/src/input/http_helper.c @@ -240,8 +240,7 @@ char *_x_canonicalise_url (const char *base, const char *url) { ++cut; } base_length = cut ? (size_t)(cut - base) : strlen (base); - ret = malloc (base_length + strlen (url) + 1); - sprintf (ret, "%.*s%s", (int)base_length, base, url); + asprintf (&ret, "%.*s%s", (int)base_length, base, url); return ret; } |