Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
rgw: fix error handling in RGWPostObj_ObjStore::read_with_boundary.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
  • Loading branch information
rzarzynski committed Nov 4, 2016
1 parent 1a476c1 commit 64d9e06
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions src/rgw/rgw_rest.cc
Expand Up @@ -1360,6 +1360,9 @@ int RGWPostObj_ObjStore::read_with_boundary(ceph::bufferlist& bl,
bufferptr bp(need_to_read);

const auto read_len = recv_body(s, bp.c_str(), need_to_read);
if (read_len < 0) {
return read_len;
}
in_data.append(bp, 0, read_len);
}

Expand Down Expand Up @@ -1388,8 +1391,10 @@ int RGWPostObj_ObjStore::read_with_boundary(ceph::bufferlist& bl,
if (left < skip + 2) {
int need = skip + 2 - left;
bufferptr boundary_bp(need);
int actual;
recv_body(s, boundary_bp.c_str(), need);
const int r = recv_body(s, boundary_bp.c_str(), need);
if (r < 0) {
return r;
}
in_data.append(boundary_bp);
}
max += skip; // skip boundary for next time
Expand Down

0 comments on commit 64d9e06

Please sign in to comment.