Merge branch 'master' of git.freeswitch.org:freeswitch

This commit is contained in:
Steve Underwood 2014-01-16 00:49:11 +08:00
commit c92aa56d57

View File

@ -140,7 +140,8 @@ JS_FILEIO_FUNCTION_IMPL(Read)
if (bytes) { if (bytes) {
if (!_buf || _bufsize < bytes) { if (!_buf || _bufsize < bytes) {
_buf = (char *)switch_core_alloc(_pool, bytes); _buf = (char *)switch_core_alloc(_pool, bytes+1);
memset(_buf, 0, bytes+1);
_bufsize = bytes; _bufsize = bytes;
} }
@ -156,7 +157,12 @@ JS_FILEIO_FUNCTION_IMPL(Read)
JS_FILEIO_FUNCTION_IMPL(GetData) JS_FILEIO_FUNCTION_IMPL(GetData)
{ {
HandleScope handle_scope(info.GetIsolate()); HandleScope handle_scope(info.GetIsolate());
info.GetReturnValue().Set(String::NewFromUtf8(info.GetIsolate(), js_safe_str(_buf)));
if (!_buflen || !_buf) {
info.GetReturnValue().Set(false);
} else {
info.GetReturnValue().Set(String::NewFromUtf8(info.GetIsolate(), _buf));
}
} }
JS_FILEIO_FUNCTION_IMPL(Write) JS_FILEIO_FUNCTION_IMPL(Write)