Fix crash in setJavaObject if no fields mapped

spotify · Apr 8, 2016 · 9870ca5 · 9870ca5
1 parent 0f28c22
commit 9870ca5
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/cpp/JavaClass.cpp b/src/main/cpp/JavaClass.cpp
@@ -76,7 +76,12 @@ void JavaClass::setJavaObject(JNIEnv *env, jobject javaThis) {
     mapFields();
   }
 
-   for (FieldMap::const_iterator iter = _fields->begin(); iter != _fields->end(); ++iter) {
+  // If there are no fields to be mapped, then bail out
+  if (_fields == NULL) {
+    return;
+  }
+
+  for (FieldMap::const_iterator iter = _fields->begin(); iter != _fields->end(); ++iter) {
     std::string key = iter->first;
     LOG_DEBUG("Copying field '%s'", key.c_str());