summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSiggi Langauf <siggi@users.sourceforge.net>2004-03-16 21:32:23 +0000
committerSiggi Langauf <siggi@users.sourceforge.net>2004-03-16 21:32:23 +0000
commitdada0bb666c3c6900802fb929e724e45f8a2e682 (patch)
tree65d3be7d57ed02febf4a2e4a33a060a50721b445 /src
parentbc7f42e95e56f173540cff9bfa51669b193dc337 (diff)
downloadxine-lib-dada0bb666c3c6900802fb929e724e45f8a2e682.tar.gz
xine-lib-dada0bb666c3c6900802fb929e724e45f8a2e682.tar.bz2
prevent segfaults (patch from Debian bug #228751, posted by Michel Daenzer)
CVS patchset: 6276 CVS date: 2004/03/16 21:32:23
Diffstat (limited to 'src')
-rw-r--r--src/xine-engine/configfile.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index dd8fa7806..64ea3198f 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.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: configfile.c,v 1.63 2004/03/16 20:50:08 mroi Exp $
+ * $Id: configfile.c,v 1.64 2004/03/16 21:32:23 siggi Exp $
*
* config object (was: file) management - implementation
*
@@ -127,7 +127,9 @@ static void config_insert(config_values_t *this, cfg_entry_t *new_entry) {
if (new_entry->exp_level < cur->exp_level) break;
if (new_entry->exp_level > cur->exp_level) continue;
/* sort by entry name */
- {
+ if (!new_name && cur_name) break;
+ if ( new_name && !cur_name) continue;
+ if ( new_name && cur_name) {
int cmp = strcmp(new_name, cur_name);
if (cmp < 0) break;
if (cmp > 0) continue;