pdxx
/
fastdfs
mirror of https://github.com/happyfish100/fastdfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

judge read_bytes > 0

pull/56/merge
yuqing 2017-03-08 15:57:30 +08:00
parent fa8331340f
commit 51e9da9a77
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tracker/tracker_service.c
View File

@ -1992,24 +1992,27 @@ static int tracker_deal_get_one_sys_file(struct fast_task_info *pTask)
long2buff(file_stat.st_size, p); long2buff(file_stat.st_size, p);
p += FDFS_PROTO_PKG_LEN_SIZE; p += FDFS_PROTO_PKG_LEN_SIZE;
bytes = read_bytes + 1; if (read_bytes > 0)
if (read_bytes > 0 && (result=getFileContentEx(full_filename, \ {
p, offset, &bytes)) != 0) bytes = read_bytes + 1;
{ if ((result=getFileContentEx(full_filename, \
pTask->length = sizeof(TrackerHeader); p, offset, &bytes)) != 0)
return result; {
} pTask->length = sizeof(TrackerHeader);
return result;
}
if (bytes != read_bytes) if (bytes != read_bytes)
{ {
logError("file: "__FILE__", line: %d, " \ logError("file: "__FILE__", line: %d, " \
"client ip: %s, read bytes: %"PRId64 "client ip: %s, read bytes: %"PRId64
" != expect bytes: %"PRId64, \ " != expect bytes: %"PRId64, \
__LINE__, pTask->client_ip, bytes, read_bytes); __LINE__, pTask->client_ip, bytes, read_bytes);
pTask->length = sizeof(TrackerHeader); pTask->length = sizeof(TrackerHeader);
return EIO; return EIO;
} }
}
p += read_bytes; p += read_bytes;
pTask->length = p - pTask->data; pTask->length = p - pTask->data;