RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 03:27:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

rados: fix error paths in do_put()

Browse Source 
CID 716986: Improper use of negative value (NEGATIVE_RETURNS)
At (9): "count" is passed to a parameter that cannot be negative. [hide details]

+ other stuff

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2012-09-28 08:03:11 -07:00
parent 903f60aee0
commit 67caceec18
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/rados.cc
View File

@ -341,12 +341,17 @@ static int do_put(IoCtx& io_ctx, const char *objname, const char *infile, int op
uint64_t offset = 0;
while (count != 0) {
count = read(fd, buf, op_size);
if (count < 0) {
ret = -errno;
cerr << "error reading input file " << infile << ": " << cpp_strerror(ret) << std::endl;
goto out;
}
if (count == 0) {
if (!offset) {
int ret = io_ctx.create(oid, true);
ret = io_ctx.create(oid, true);
if (ret < 0) {
cerr << "WARNING: could not create object: " << oid << std::endl;
return 1;
goto out;
}
}
continue;
@ -359,13 +364,14 @@ static int do_put(IoCtx& io_ctx, const char *objname, const char *infile, int op
indata.clear();
if (ret < 0) {
close(fd);
return ret;
goto out;
}
offset += count;
}
close(fd);
return 0;
ret = 0;
out:
TEMP_FAILURE_RETRY(close(fd));
return ret;
}
class RadosWatchCtx : public librados::WatchCtx {