RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-18 16:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

msg/msg_types: fix entity_addrvec_t::parse() with null end arg

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2018-11-26 22:12:11 -06:00
parent 6429537bd7
commit 35d4283106
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/msg/msg_types.cc
View File

@ -223,6 +223,10 @@ ostream& operator<<(ostream& out, const sockaddr *sa)
bool entity_addrvec_t::parse(const char *s, const char **end)
{
const char *static_end;
if (!end) {
end = &static_end;
}
v.clear();
while (*s) {
entity_addr_t a;

9
src/test/cli/monmaptool/add-many.t
View File

@ -14,7 +14,9 @@
$ monmaptool --add baz 4.5.6.7:8901 mymonmap
monmaptool: monmap file mymonmap
monmaptool: writing epoch 0 to mymonmap (3 monitors)
$ monmaptool --addv fiz v2:172.21.15.68:6791,v1:172.21.15.68:6792 mymonmap
monmaptool: monmap file mymonmap
monmaptool: writing epoch 0 to mymonmap (4 monitors)
$ monmaptool --print mymonmap
monmaptool: monmap file mymonmap
epoch 0
@ -22,8 +24,9 @@
last_changed \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)
created \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re)
0: v1:2.3.4.5:6789/0 mon.foo
1: v2:3.4.5.6:7890/0 mon.bar
2: v2:4.5.6.7:8901/0 mon.baz
1: [v2:172.21.15.68:6791/0,v1:172.21.15.68:6792/0] mon.fiz
2: v2:3.4.5.6:7890/0 mon.bar
3: v2:4.5.6.7:8901/0 mon.baz
$ NEW_FSID="$(monmaptool --print mymonmap|grep ^fsid)"
$ [ "$ORIG_FSID" = "$NEW_FSID" ]