King_DuckZ/dindexer
1
0
Fork 0
mirror of https://github.com/KingDuckZ/dindexer.git synced 2025-02-20 12:14:55 +00:00
Code Issues Releases Wiki Activity

Fix wrong assertions.

Browse source
This commit is contained in:
King_DuckZ 2016-05-18 22:25:41 +02:00
parent b52271e2b8
commit 42acc42d8f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/dindexer-machinery/recorddata.hpp
View file

@ -93,8 +93,8 @@ namespace mchlib {
void set_mime_parts ( boost::string_ref parType, boost::string_ref parCharset ) { void set_mime_parts ( boost::string_ref parType, boost::string_ref parCharset ) {
const auto& mime = mime_full.get(); const auto& mime = mime_full.get();
{ {
assert(std::less<const char*>()(mime.data(), parType.data())); assert(std::less_equal<const char*>()(mime.data(), parType.data()));
assert(std::less_equal<const char*>()(parType.data() + parType.size(), mime.data())); assert(std::less_equal<const char*>()(parType.data() + parType.size(), mime.data() + mime.size()));
assert(parType.data() - mime.data() < USHRT_MAX); assert(parType.data() - mime.data() < USHRT_MAX);
assert(parType.size() < USHRT_MAX); assert(parType.size() < USHRT_MAX);
assert(parType.size() + (parType.data() - mime.data()) <= mime.size()); assert(parType.size() + (parType.data() - mime.data()) <= mime.size());
@ -102,8 +102,8 @@ namespace mchlib {
mime_type_length = static_cast<uint16_t>(parType.size()); mime_type_length = static_cast<uint16_t>(parType.size());
} }
{ {
assert(std::less<const char*>()(mime.data(), parCharset.data())); assert(std::less_equal<const char*>()(mime.data(), parCharset.data()));
assert(std::less_equal<const char*>()(parCharset.data() + parCharset.size(), mime.data())); assert(std::less_equal<const char*>()(parCharset.data() + parCharset.size(), mime.data() + mime.size()));
assert(parCharset.data() - mime.data() < USHRT_MAX); assert(parCharset.data() - mime.data() < USHRT_MAX);
assert(parCharset.size() < USHRT_MAX); assert(parCharset.size() < USHRT_MAX);
assert(parCharset.size() + (parCharset.data() - mime.data()) <= mime.size()); assert(parCharset.size() + (parCharset.data() - mime.data()) <= mime.size());