Permalink
Browse files

Merge pull request #757 from patcheng/feature/fix_clang_warning

added assertion to help suppress clang warnings
  • Loading branch information...
2 parents 369e07d + 95224af commit 03a73910498d784a3a9429202a90d2fb67be910b @miloyip committed on GitHub Dec 23, 2016
Showing with 7 additions and 4 deletions.
  1. +1 −0 include/rapidjson/internal/stack.h
  2. +6 −4 include/rapidjson/reader.h
@@ -126,6 +126,7 @@ class Stack {
template<typename T>
RAPIDJSON_FORCEINLINE T* PushUnsafe(size_t count = 1) {
+ RAPIDJSON_ASSERT(stackTop_);
RAPIDJSON_ASSERT(stackTop_ + sizeof(T) * count <= stackEnd_);
T* ret = reinterpret_cast<T*>(stackTop_);
stackTop_ += sizeof(T) * count;
@@ -934,11 +934,13 @@ class GenericReader {
#else
length = static_cast<SizeType>(__builtin_ffs(r) - 1);
#endif
- char* q = reinterpret_cast<char*>(os.Push(length));
- for (size_t i = 0; i < length; i++)
- q[i] = p[i];
+ if (length != 0) {
+ char* q = reinterpret_cast<char*>(os.Push(length));
+ for (size_t i = 0; i < length; i++)
+ q[i] = p[i];
- p += length;
+ p += length;
+ }
break;
}
_mm_storeu_si128(reinterpret_cast<__m128i *>(os.Push(16)), s);

0 comments on commit 03a7391

Please sign in to comment.