fix #66

Author: siscia

redisql_lib/src/community_statement.rs

@@ -68,7 +68,14 @@ pub fn generate_statements(
     db: Arc<Mutex<RawConnection>>,
     query: &str,
 ) -> Result<MultiStatement, SQLite3Error> {
-    let raw_query = CString::new(query.to_string()).unwrap();
+    let raw_query = match CString::new(query.to_string()) {
+        Ok(r) => r,
+        Err(e) => return Err(SQLite3Error{
+            code: 999,
+            error_message: "Trying to create a statement with a NULL byte.".to_string(),
+            error_string: format!("Find NULL byte in position {} while trying to create a statement", e.nul_position()),
+        }),
+    };
     let mut next_query = raw_query.as_ptr();
     let mut stmts = Vec::new();
 

redisql_lib/src/redis.rs

@@ -437,20 +437,21 @@ fn parse_args(
         Vec::with_capacity(argc as usize);
     for i in 0..argc {
         let redis_str = unsafe { *argv.offset(i as isize) };
-        let arg = unsafe { string_ptr_len(redis_str)? };
+        let arg = string_ptr_len(redis_str)?;
         args.push(arg);
     }
     Ok(args)
 }
 
-pub unsafe fn string_ptr_len(
+pub fn string_ptr_len(
     str: *mut rm::ffi::RedisModuleString,
 ) -> Result<&'static str, std::str::Utf8Error> {
     let mut len = 0;
-    let base =
+    let base = unsafe {
         rm::ffi::RedisModule_StringPtrLen.unwrap()(str, &mut len)
-            as *mut u8;
-    let slice = slice::from_raw_parts(base, len);
+            as *mut u8
+    };
+    let slice = unsafe { slice::from_raw_parts(base, len) };
     let s = str::from_utf8(slice)?;
     Ok(s.trim_end_matches(char::from(0)))
 }

test/correctness/test.py

@@ -925,6 +925,13 @@ def test_newline_after_semicolon_then_query(self):
           one = self.exec_naked("REDISQL.EXEC", "NULL", "SELECT 1;\nSELECT 2;")
           self.assertEquals(one, [[2]])
 
+class TestWithNullChars(TestRediSQLWithExec):
+    def test_with_null_at_the_end(self):
+        with DB(self, 'A'):
+            self.assertRaises(redis.ResponseError, self.exec_naked, "REDISQL.EXEC", "A", "SELECT \0 1;")
+        with DB(self, 'B'):
+            self.assertRaises(redis.ResponseError, self.exec_naked, "REDISQL.EXEC", "A", "SELECT 1;\0")
+
 if __name__ == '__main__':
    unittest.main()