MDEV-23680 Assertion `data' failed in crcr32_calc_pclmulqdq

Fix DBUG_ASSERT
MariaDB · Sep 7, 2020 · 30ff616 · 30ff616
1 parent 2cc9e45
commit 30ff616
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/mysql-test/main/func_math.result b/mysql-test/main/func_math.result
@@ -3591,5 +3591,11 @@ t2	CREATE TABLE `t2` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP TABLE t2, t1;
 #
+# MDEV-23680 Assertion `data' failed in crcr32_calc_pclmulqdq
+#
+SELECT CRC32(ExtractValue('<a><b/></a>', '/a/b')) AS f;
+f
+0
+#
 # End of 10.5 tests
 #
diff --git a/mysql-test/main/func_math.test b/mysql-test/main/func_math.test
@@ -1883,6 +1883,11 @@ CREATE TABLE t2 AS SELECT UUID_SHORT() - a FROM t1;
 SHOW CREATE TABLE t2;
 DROP TABLE t2, t1;
 
+--echo #
+--echo # MDEV-23680 Assertion `data' failed in crcr32_calc_pclmulqdq
+--echo #
+SELECT CRC32(ExtractValue('<a><b/></a>', '/a/b')) AS f;
+
 
 --echo #
 --echo # End of 10.5 tests

diff --git a/mysys/crc32/crc32_x86.c b/mysys/crc32/crc32_x86.c
@@ -219,7 +219,7 @@ static inline uint32_t crcr32_calc_pclmulqdq(const uint8_t *data, uint32_t data_
   __m128i temp, fold, k;
   uint32_t n;
 
-  DBUG_ASSERT(data);
+  DBUG_ASSERT(data != NULL || data_len == 0);
   DBUG_ASSERT(params);
 
   if (unlikely(data_len == 0))