From c749ef5ef58af5f1a1856c802b0726bf6912601a Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Wed, 9 Jan 2008 22:18:11 +0000
Subject: Allow for patch-level numbering; initialise to ".1".

---
 ChangeLog    | 2 ++
 configure.ac | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 18a94dd93..b43e2b5d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+xine-lib (1.1.9.1) (unreleased)
+
 xine-lib (1.1.9)
   * Fix dvd://.../title[.chapter] handling (somewhat broken in 1.1.8).
   * Fix switching DVB subtitles channels.
diff --git a/configure.ac b/configure.ac
index 9bb6eca4f..f92318924 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,16 +12,18 @@ dnl
 AC_PREREQ(2.59)
 
 dnl Making releases:
-dnl   XINE_SUB += 1; continue with XINE_LT_* values below
+dnl   XINE_SUB += 1; XINE_PATCH = ''; continue with XINE_LT_* values below
 dnl
 XINE_MAJOR=1
 XINE_MINOR=1
 XINE_SUB=9
+# XINE_PATCH should be left empty or set to ".1" or ".2" or something similar
+XINE_PATCH=.1
 
 #if test $XINE_SUB -eq 0 ; then
 #  XINE_SUBPART="";
 #else
-  XINE_SUBPART=".$XINE_SUB"
+  XINE_SUBPART=".$XINE_SUB$XINE_PATCH"
 #fi
 
 dnl The libtool version numbers (XINE_LT_*); Don't even think about faking this!
@@ -69,6 +71,7 @@ AC_SUBST(XINE_BIN_AGE)
 AC_DEFINE_UNQUOTED(XINE_MAJOR, $XINE_MAJOR,[xine major version number])
 AC_DEFINE_UNQUOTED(XINE_MINOR, $XINE_MINOR,[xine minor version number])
 AC_DEFINE_UNQUOTED(XINE_SUB, $XINE_SUB, [xine sub version number])
+AC_DEFINE_UNQUOTED(XINE_PATCH, $XINE_PATCH, [xine patch version number])
 
 AC_SUBST(XINE_LT_CURRENT)
 AC_SUBST(XINE_LT_REVISION)
@@ -2388,7 +2391,7 @@ makeexpand () {
   echo "$i"
 }
 
-XINE_PLUGINDIR="$libdir/xine/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB"
+XINE_PLUGINDIR="$libdir/xine/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PATCH"
 XINE_FONTDIR="${datadir}/xine/libxine$XINE_MAJOR/fonts"
 XINE_LOCALEDIR="${datadir}/locale"
 XINE_REL_PLUGINDIR="`makeexpand "$XINE_PLUGINDIR"`"
-- 
cgit v1.2.3


From 2a9d1fe9f99cc2329a762f6e30a8ee0dc8e84014 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Wed, 9 Jan 2008 22:19:42 +0000
Subject: Fix a read-past-end bug in xine-lib's internal strtok_r replacement.

---
 ChangeLog      | 2 ++
 lib/strtok_r.c | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b43e2b5d0..c2a6a74de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
 xine-lib (1.1.9.1) (unreleased)
+  * Fix a read-past-end bug in xine-lib's internal strtok_r replacement.
+    (Only affects systems without strtok_r.)
 
 xine-lib (1.1.9)
   * Fix dvd://.../title[.chapter] handling (somewhat broken in 1.1.8).
diff --git a/lib/strtok_r.c b/lib/strtok_r.c
index cead029a2..8a5284a42 100644
--- a/lib/strtok_r.c
+++ b/lib/strtok_r.c
@@ -19,7 +19,7 @@ char *xine_private_strtok_r(char *s, const char *delim, char **ptrptr) {
   else s = *ptrptr;
 
   /* end of searching */
-  if (!s || s == '\0') return NULL;
+  if (!s || !*s) return NULL;
 
   /* cut the initial garbage */
   cutlen = strspn(s, delim);
@@ -32,12 +32,12 @@ char *xine_private_strtok_r(char *s, const char *delim, char **ptrptr) {
   }
   next = s + toklen;
 
+  /* prepare next call */
+  *ptrptr = *next ? next + 1 : NULL;
+
   /* cut current token */
   *next = '\0';
 
-  /* prepare next call */
-  *ptrptr = next + 1;
-
   /* return the token */
   return s;
 }
-- 
cgit v1.2.3