Merge from 1.1.

2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 1d465f0e7..fba049862 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,10 @@ xine-lib (1.1.90) (Unreleased)
   * Check for supported extensions before opening the plugin and remove
     redundant core from plugins.
 
+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).
   * Fix switching DVB subtitles channels.
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;
 }