From 1ad19232c4bbecb06e6acbb2a3a538544a28e1f2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 11 May 2018 12:02:19 +0200
Subject: [PATCH] Don't return negative numbers from the flex tokenizer

Fixes #1374.
Closes #2129.
---
 src/libexpr/lexer.l            | 6 +++++-
 tests/lang/parse-fail-uft8.nix | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 tests/lang/parse-fail-uft8.nix

diff --git a/src/libexpr/lexer.l b/src/libexpr/lexer.l
index 8855d794e..29ca327c1 100644
--- a/src/libexpr/lexer.l
+++ b/src/libexpr/lexer.l
@@ -209,7 +209,11 @@ or          { return OR_KW; }
 \#[^\r\n]*    /* single-line comments */
 \/\*([^*]|\*+[^*/])*\*+\/  /* long comments */
 
-{ANY}           return yytext[0];
+{ANY}       {
+              /* Don't return a negative number, as this will cause
+                 Bison to stop parsing without an error. */
+              return (unsigned char) yytext[0];
+            }
 
 }
 
diff --git a/tests/lang/parse-fail-uft8.nix b/tests/lang/parse-fail-uft8.nix
new file mode 100644
index 000000000..34948d48a
--- /dev/null
+++ b/tests/lang/parse-fail-uft8.nix
@@ -0,0 +1 @@
+123 é 4