Merge pull request mariadb-corporation#657 from mariadb-corporation/MCOL-2018

David.Hall · web-flow · commit 289c163a73e6 · 2018-12-13T09:24:33.000-06:00
MCOL-2018 Fix array bounds issue
diff --git a/utils/rowgroup/rowgroup.h b/utils/rowgroup/rowgroup.h
@@ -1617,7 +1617,7 @@ inline bool StringStore::isNullValue(uint64_t off) const
         return true;
     if (mc->data[offset+4] == 0)    // "" = NULL string for some reason...
         return true;
-    return (*((uint64_t *) &mc->data[offset]+4) == *((uint64_t *) joblist::CPNULLSTRMARK.c_str()));
+    return (memcmp(&mc->data[offset+4], joblist::CPNULLSTRMARK.c_str(), 8) == 0);
 }
 
 inline bool StringStore::equals(const std::string &str, uint64_t off) const

Original file line number	Diff line number	Diff line change
`@@ -1617,7 +1617,7 @@ inline bool StringStore::isNullValue(uint64_t off) const`
`1617`	`1617`	`return true;`
`1618`	`1618`	`if (mc->data[offset+4] == 0) // "" = NULL string for some reason...`
`1619`	`1619`	`return true;`
`1620`		`- return (((uint64_t ) &mc->data[offset]+4) == ((uint64_t ) joblist::CPNULLSTRMARK.c_str()));`
	`1620`	`+ return (memcmp(&mc->data[offset+4], joblist::CPNULLSTRMARK.c_str(), 8) == 0);`
`1621`	`1621`	`}`
`1622`	`1622`
`1623`	`1623`	`inline bool StringStore::equals(const std::string &str, uint64_t off) const`