Merge pull request #3363 from ebms03:fix-resolve-plugin-segfault

PiperOrigin-RevId: 947628510 Change-Id: Ied0fcd3bb30267a133f1c6f6d6799c9236bc6845
2026-07-14 05:47:35 -07:00
parent 23cc383372 07c14a7c1a
commit b7af32ac87
3 changed files with 41 additions and 2 deletions
@@ -5962,15 +5962,14 @@ void mjCModel::ResolvePlugin(mjCBase* obj, const std::string& plugin_name,
  else if (!*plugin_instance) {
    *plugin_instance =
      static_cast<mjCPlugin*>(FindObject(mjOBJ_PLUGIN, plugin_instance_name));
-    (*plugin_instance)->plugin_slot = plugin_slot;
    if (!*plugin_instance) {
      throw mjCError(
              obj, "unrecognized name '%s' for plugin instance", plugin_instance_name.c_str());
    }
+    (*plugin_instance)->plugin_slot = plugin_slot;
    if (plugin_slot != -1 && plugin_slot != (*plugin_instance)->plugin_slot) {
      throw mjCError(
              obj, "'plugin' attribute does not match that of the instance");
    }
-    plugin_slot = (*plugin_instance)->plugin_slot;
  }
 }