From 219e723974e98d9c6da4e1f94cb6ff4be84c5dab Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Mon, 13 Feb 2012 10:30:46 +0100
Subject: [PATCH] Fix crash on mismatching quotation (fixes #137)

---
 docs/changes.rst                                |  3 +++
 mopidy/frontends/mpd/protocol/music_db.py       | 10 ++++++++--
 tests/frontends/mpd/protocol/regression_test.py | 16 ++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/docs/changes.rst b/docs/changes.rst
index b389b7be..69de8558 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -31,6 +31,9 @@ v0.7.0 (in development)
 - Fix ``gst.LinkError`` which appeared when using newer versions of GStreamer,
   e.g. on Ubuntu 12.04 Alpha. (Fixes: :issue:`144`)
 
+- Fix crash on mismatching quotation in ``list`` MPD queries. (Fixes:
+  :issue:`137`)
+
 
 v0.6.1 (2011-12-28)
 ===================
diff --git a/mopidy/frontends/mpd/protocol/music_db.py b/mopidy/frontends/mpd/protocol/music_db.py
index 299fce97..cde2754a 100644
--- a/mopidy/frontends/mpd/protocol/music_db.py
+++ b/mopidy/frontends/mpd/protocol/music_db.py
@@ -189,8 +189,14 @@ def _list_build_query(field, mpd_query):
     """Converts a ``list`` query to a Mopidy query."""
     if mpd_query is None:
         return {}
-    # shlex does not seem to be friends with unicode objects
-    tokens = shlex.split(mpd_query.encode('utf-8'))
+    try:
+        # shlex does not seem to be friends with unicode objects
+        tokens = shlex.split(mpd_query.encode('utf-8'))
+    except ValueError as error:
+        if error.message == 'No closing quotation':
+            raise MpdArgError(u'Invalid unquoted character', command=u'list')
+        else:
+            raise error
     tokens = [t.decode('utf-8') for t in tokens]
     if len(tokens) == 1:
         if field == u'album':
diff --git a/tests/frontends/mpd/protocol/regression_test.py b/tests/frontends/mpd/protocol/regression_test.py
index d4e4b2aa..7f214efa 100644
--- a/tests/frontends/mpd/protocol/regression_test.py
+++ b/tests/frontends/mpd/protocol/regression_test.py
@@ -146,3 +146,19 @@ class IssueGH113RegressionTest(protocol.BaseTestCase):
         self.sendRequest(
             r'listplaylistinfo "all lart spotify:track:\\w\\{22\\} pastes"')
         self.assertInResponse('OK')
+
+
+class IssueGH137RegressionTest(protocol.BaseTestCase):
+    """
+    The issue: https://github.com/mopidy/mopidy/issues/137
+
+    How to reproduce:
+
+    - Send "list" query with mismatching quotes
+    """
+
+    def test(self):
+        self.sendRequest(u'list Date Artist "Anita Ward" '
+            u'Album "This Is Remixed Hits - Mashups & Rare 12" Mixes"')
+
+        self.assertInResponse('ACK [2@0] {list} Invalid unquoted character')