Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed missing length

This commit is contained in:
Frank Celler 2013-04-05 14:47:45 +02:00
parent 71bf83be1b
commit ab38a0543a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Basics/FileUtils.cpp
View File

@ -94,10 +94,13 @@ namespace triagens {
} }
if (n < 0) { if (n < 0) {
TRI_CLOSE(fd); TRI_set_errno(TRI_ERROR_SYS_ERROR);
LOGGER_TRACE("read failed for '" << filename LOGGER_TRACE("read failed for '" << filename
<< "' with " << strerror(errno) << " and result " << n << "' with " << strerror(errno) << " and result " << n
<< " on fd " << fd); << " on fd " << fd);
TRI_CLOSE(fd);
THROW_FILE_FUNC_ERROR("read", "", errno); THROW_FILE_FUNC_ERROR("read", "", errno);
} }
@ -106,7 +109,7 @@ namespace triagens {
TRI_CLOSE(fd); TRI_CLOSE(fd);
string r(result.c_str()); string r(result.c_str(), result.length());
return r; return r;
} }

4
lib/Basics/StringUtils.cpp
View File

@ -2976,9 +2976,9 @@ namespace triagens {
return ok; return ok;
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// BASE64 // BASE64
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
string encodeBase64 (string const& in) { string encodeBase64 (string const& in) {
unsigned char charArray3[3]; unsigned char charArray3[3];