Commit 43f983f3 authored by Davis King's avatar Davis King

Fixed a bug which could potentially occur when empty std::vector<char>

or std::vector<unsigned char> were serialized.
parent 721d55a6
...@@ -893,7 +893,8 @@ namespace dlib ...@@ -893,7 +893,8 @@ namespace dlib
{ {
const unsigned long size = static_cast<unsigned long>(item.size()); const unsigned long size = static_cast<unsigned long>(item.size());
serialize(size,out); serialize(size,out);
out.write(&item[0], item.size()); if (item.size() != 0)
out.write(&item[0], item.size());
} }
catch (serialization_error& e) catch (serialization_error& e)
{ throw serialization_error(e.info + "\n while serializing object of type std::vector"); } { throw serialization_error(e.info + "\n while serializing object of type std::vector"); }
...@@ -910,7 +911,8 @@ namespace dlib ...@@ -910,7 +911,8 @@ namespace dlib
unsigned long size; unsigned long size;
deserialize(size,in); deserialize(size,in);
item.resize(size); item.resize(size);
in.read(&item[0], item.size()); if (item.size() != 0)
in.read(&item[0], item.size());
} }
catch (serialization_error& e) catch (serialization_error& e)
{ throw serialization_error(e.info + "\n while deserializing object of type std::vector"); } { throw serialization_error(e.info + "\n while deserializing object of type std::vector"); }
...@@ -928,7 +930,8 @@ namespace dlib ...@@ -928,7 +930,8 @@ namespace dlib
{ {
const unsigned long size = static_cast<unsigned long>(item.size()); const unsigned long size = static_cast<unsigned long>(item.size());
serialize(size,out); serialize(size,out);
out.write((char*)&item[0], item.size()); if (item.size() != 0)
out.write((char*)&item[0], item.size());
} }
catch (serialization_error& e) catch (serialization_error& e)
{ throw serialization_error(e.info + "\n while serializing object of type std::vector"); } { throw serialization_error(e.info + "\n while serializing object of type std::vector"); }
...@@ -945,7 +948,8 @@ namespace dlib ...@@ -945,7 +948,8 @@ namespace dlib
unsigned long size; unsigned long size;
deserialize(size,in); deserialize(size,in);
item.resize(size); item.resize(size);
in.read((char*)&item[0], item.size()); if (item.size() != 0)
in.read((char*)&item[0], item.size());
} }
catch (serialization_error& e) catch (serialization_error& e)
{ throw serialization_error(e.info + "\n while deserializing object of type std::vector"); } { throw serialization_error(e.info + "\n while deserializing object of type std::vector"); }
......
...@@ -528,6 +528,14 @@ namespace ...@@ -528,6 +528,14 @@ namespace
{ {
DLIB_TEST(a[i] == b[i]); DLIB_TEST(a[i] == b[i]);
} }
std::vector<T> c;
sout.str("");
dlib::serialize(c, sout);
sin.str(sout.str());
dlib::deserialize(a, sin);
DLIB_TEST(a.size() == 0);
DLIB_TEST(c.size() == 0);
} }
void test_vector_bool ( void test_vector_bool (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment