diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-02-15 20:31:23 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-02-15 20:31:23 +0000 |
| commit | 63873dafd5ab98102e7adb4dc6e611314b711ef2 (patch) | |
| tree | 5e818037137ce91fe6062681efb177597e619f5d | |
| parent | bc8e97613fad7177ce17b5f04a966940a2c03f04 (diff) | |
| download | xine-lib-63873dafd5ab98102e7adb4dc6e611314b711ef2.tar.gz xine-lib-63873dafd5ab98102e7adb4dc6e611314b711ef2.tar.bz2 | |
thank you, valgrind
CVS patchset: 6162
CVS date: 2004/02/15 20:31:23
| -rw-r--r-- | src/input/input_http.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/xine.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/input/input_http.c b/src/input/input_http.c index da202607f..dad6a09c3 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.c @@ -19,7 +19,7 @@ * * input plugin for http network streams * - * $Id: input_http.c,v 1.82 2004/01/23 00:01:08 valtri Exp $ + * $Id: input_http.c,v 1.83 2004/02/15 20:31:23 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -448,7 +448,7 @@ static uint32_t http_plugin_get_capabilities (input_plugin_t *this_gen) { uint32_t caps = INPUT_CAP_PREVIEW; /* Nullsoft asked to not allow saving streaming nsv files */ - if (this->uri && + if (this->uri && strlen(this->uri) >= 4 && !strncmp(this->uri + strlen(this->uri) - 4, ".nsv", 4)) caps |= INPUT_CAP_RIP_FORBIDDEN; diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index ec0de15d2..9564c8d25 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.c,v 1.281 2004/02/12 18:19:00 mroi Exp $ + * $Id: xine.c,v 1.282 2004/02/15 20:31:23 mroi Exp $ */ /* @@ -1365,8 +1365,10 @@ static void __config_demux_strategy_cb (void *this_gen, xine_cfg_entry_t *entry) static void __config_save_cb (void *this_gen, xine_cfg_entry_t *entry) { xine_t *this = (xine_t *)this_gen; - char *homedir_trail_slash = strcat(strdup(xine_get_homedir()), "/"); + char *homedir_trail_slash; + homedir_trail_slash = (char *)malloc(strlen(xine_get_homedir()) + 2); + sprintf(homedir_trail_slash, "%s/", xine_get_homedir()); if (entry->str_value[0] && (entry->str_value[0] != '/' || strstr(entry->str_value, "/.") || strcmp(entry->str_value, xine_get_homedir()) == 0 || |