FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added null pointer handling

Browse Source
This commit is contained in:
Robert Osfield 2016-06-30 09:48:44 +01:00
parent 314deedcf5
commit cbba625b07
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgPlugins/osgjs/JSON_Objects.cpp
View File

@ -216,7 +216,10 @@ void JSONObject::encodeArrayAsVarintBuffer(osg::Array const* array, std::vector<
} }
template<typename T> template<typename T>
void JSONObject::dumpVarintVector(std::vector<uint8_t>& oss, T const* buffer, bool isUnsigned) const { void JSONObject::dumpVarintVector(std::vector<uint8_t>& oss, T const* buffer, bool isUnsigned) const
{
if (!buffer) return;
unsigned int n = buffer->getDataSize(); unsigned int n = buffer->getDataSize();
for(typename T::const_iterator it = buffer->begin() ; it != buffer->end() ; ++ it) { for(typename T::const_iterator it = buffer->begin() ; it != buffer->end() ; ++ it) {
for(unsigned int i = 0 ; i < n ; ++ i) { for(unsigned int i = 0 ; i < n ; ++ i) {
@ -229,7 +232,10 @@ void JSONObject::dumpVarintVector(std::vector<uint8_t>& oss, T const* buffer, bo
} }
template<typename T> template<typename T>
void JSONObject::dumpVarintValue(std::vector<uint8_t>& oss, T const* buffer, bool isUnsigned) const { void JSONObject::dumpVarintValue(std::vector<uint8_t>& oss, T const* buffer, bool isUnsigned) const
{
if (!buffer) return;
for(typename T::const_iterator it = buffer->begin() ; it != buffer->end() ; ++ it) { for(typename T::const_iterator it = buffer->begin() ; it != buffer->end() ; ++ it) {
unsigned int value = isUnsigned ? (*it) : JSONObject::toVarintUnsigned(*it); unsigned int value = isUnsigned ? (*it) : JSONObject::toVarintUnsigned(*it);