From ce112e0789b337490d686c80e76fc37f2a4bfe35 Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@mplayer2.org>
Date: Sun, 31 Jul 2011 20:25:22 +0300
Subject: options: fix failure to parse trailing ',' in string list

A trailing separator in string list options was ignored after recent
commit e873d703e9 ("options: change option parsing to use bstr"),
which broke uses such as "-vo vdpau,". Fix.
---
 m_option.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'm_option.c')

diff --git a/m_option.c b/m_option.c
index 34b7cd7a99..a7321cb629 100644
--- a/m_option.c
+++ b/m_option.c
@@ -717,11 +717,13 @@ static int parse_str_list(const m_option_t *opt, struct bstr name,
     char *ptr = str.start;
     n = 0;
 
-    while (str.len) {
+    while (1) {
         struct bstr el = get_nextsep(&str, separator, 1);
         res[n] = bstrdup0(NULL, el);
-        str = bstr_cut(str, 1);
         n++;
+        if (!str.len)
+            break;
+        str = bstr_cut(str, 1);
     }
     res[n] = NULL;
     talloc_free(ptr);
-- 
cgit v1.2.3