Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
43f983f3
Commit
43f983f3
authored
Jan 16, 2013
by
Davis King
Browse files
Fixed a bug which could potentially occur when empty std::vector<char>
or std::vector<unsigned char> were serialized.
parent
721d55a6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
4 deletions
+16
-4
dlib/serialize.h
dlib/serialize.h
+8
-4
dlib/test/serialize.cpp
dlib/test/serialize.cpp
+8
-0
No files found.
dlib/serialize.h
View file @
43f983f3
...
...
@@ -893,7 +893,8 @@ namespace dlib
{
const
unsigned
long
size
=
static_cast
<
unsigned
long
>
(
item
.
size
());
serialize
(
size
,
out
);
out
.
write
(
&
item
[
0
],
item
.
size
());
if
(
item
.
size
()
!=
0
)
out
.
write
(
&
item
[
0
],
item
.
size
());
}
catch
(
serialization_error
&
e
)
{
throw
serialization_error
(
e
.
info
+
"
\n
while serializing object of type std::vector"
);
}
...
...
@@ -910,7 +911,8 @@ namespace dlib
unsigned
long
size
;
deserialize
(
size
,
in
);
item
.
resize
(
size
);
in
.
read
(
&
item
[
0
],
item
.
size
());
if
(
item
.
size
()
!=
0
)
in
.
read
(
&
item
[
0
],
item
.
size
());
}
catch
(
serialization_error
&
e
)
{
throw
serialization_error
(
e
.
info
+
"
\n
while deserializing object of type std::vector"
);
}
...
...
@@ -928,7 +930,8 @@ namespace dlib
{
const
unsigned
long
size
=
static_cast
<
unsigned
long
>
(
item
.
size
());
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
)
{
throw
serialization_error
(
e
.
info
+
"
\n
while serializing object of type std::vector"
);
}
...
...
@@ -945,7 +948,8 @@ namespace dlib
unsigned
long
size
;
deserialize
(
size
,
in
);
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
)
{
throw
serialization_error
(
e
.
info
+
"
\n
while deserializing object of type std::vector"
);
}
...
...
dlib/test/serialize.cpp
View file @
43f983f3
...
...
@@ -528,6 +528,14 @@ namespace
{
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
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment