From 2fb5c91f4d3e3d57b20a2476a6636f5097066f23 Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Fri, 10 Jul 2020 21:41:57 +0300
Subject: [PATCH] scanner: remove error check for embedded \x00 chars in
 c'literals'

---
 vlib/v/scanner/scanner.v     | 7 +++++--
 vlib/v/tests/cstrings_test.v | 7 +++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/vlib/v/scanner/scanner.v b/vlib/v/scanner/scanner.v
index 3b0b619a6a..7cc563271e 100644
--- a/vlib/v/scanner/scanner.v
+++ b/vlib/v/scanner/scanner.v
@@ -1113,6 +1113,7 @@ fn (mut s Scanner) ident_string() string {
 	q := s.text[s.pos]
 	is_quote := q == single_quote || q == double_quote
 	is_raw := is_quote && s.pos > 0 && s.text[s.pos - 1] == `r`
+	is_cstr := is_quote && s.pos > 0 && s.text[s.pos - 1] == `c`
 	if is_quote && !s.is_inside_string {
 		s.quote = q
 	}
@@ -1145,13 +1146,15 @@ fn (mut s Scanner) ident_string() string {
 		// Don't allow \0
 		if c == `0` && s.pos > 2 && s.text[s.pos - 1] == slash {
 			if s.pos < s.text.len - 1 && s.text[s.pos + 1].is_digit() {
-			} else {
+			} else if !is_cstr {
 				s.error('0 character in a string literal')
 			}
 		}
 		// Don't allow \x00
 		if c == `0` && s.pos > 5 && s.expect('\\x0', s.pos - 3) {
-			s.error('0 character in a string literal')
+			if !is_cstr {
+				s.error('0 character in a string literal')
+			}
 		}
 		// ${var} (ignore in vfmt mode)
 		if c == `{` && prevc == `$` && !is_raw && s.count_symbol_before(s.pos - 2, slash) % 2 == 0 {
diff --git a/vlib/v/tests/cstrings_test.v b/vlib/v/tests/cstrings_test.v
index 6bfa60aba6..b41dfe055a 100644
--- a/vlib/v/tests/cstrings_test.v
+++ b/vlib/v/tests/cstrings_test.v
@@ -7,3 +7,10 @@ fn test_cstring() {
 	assert hlen2 == 5
 	assert wlen == 5
 }
+
+fn test_cstring_with_zeros() {
+	rawbytes := c'\x00username\x00password'
+	s := string(rawbytes, 18)
+	h := s.bytes().hex()
+	assert h == '00757365726e616d650070617373776f7264'
+}