Merge branch 'devel' of github.com:arangodb/arangodb into devel

2016-04-21 12:33:52 +02:00 · 2016-04-21 12:33:52 +02:00 · 42fed6fb0d
parent 98d89f6ac3 e0c29af2ed
commit 42fed6fb0d
1 changed files with 3 additions and 0 deletions
--- a/lib/V8/v8-vpack.cpp
+++ b/lib/V8/v8-vpack.cpp
@ -36,6 +36,9 @@ static inline v8::Handle<v8::Value> ObjectVPackString(v8::Isolate* isolate,
                                                      VPackSlice const& slice) {
  arangodb::velocypack::ValueLength l;
  char const* val = slice.getString(l);
+  if (l == 0) {
+    return v8::String::Empty(isolate);
+  }
  return TRI_V8_PAIR_STRING(val, l);
 }