From: Dana Jansens <danakj@orodu.net>
Date: Wed, 24 Mar 2010 23:49:23 +0000 (-0400)
Subject: avoid ascii control characters in strings
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;ds=sidebyside;h=4968f7c62a3c072eb98702813b870a9aab58144d;p=chaz%2Fopenbox

avoid ascii control characters in strings
---

diff --git a/obt/ddfile.c b/obt/ddfile.c
index e0c7f986..05c3f1dd 100644
--- a/obt/ddfile.c
+++ b/obt/ddfile.c
@@ -96,7 +96,7 @@ static gchar* parse_string(const gchar *in, gboolean locale,
     if (!locale) {
         end = in + bytes;
         for (i = in; i < end; ++i) {
-            if (*i > 127) {
+            if (*i > 126 || *i < 32) { /* non-control character ascii */
                 end = i;
                 parse_error("Invalid bytes in string", parse, error);
                 break;
@@ -128,6 +128,10 @@ static gchar* parse_string(const gchar *in, gboolean locale,
         }
         else if (*i == '\\')
             backslash = TRUE;
+        else if (*i >= 127 || *i < 32) { /* avoid ascii control characters */
+            parse_error("Found control character in string", parse, error);
+            break;
+        }
         else {
             memcpy(o, i, next-i);
             o += next-i;