chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add checks for nullptr content_type and extension in mjpDecoder registration.

Browse Source 
PiperOrigin-RevId: 854365689
Change-Id: I025f5ab844dd4cf19f7d5f223430e27fd23a0924
This commit is contained in:
Sam Haves
2026-01-09 15:31:27 -08:00
committed by Copybara-Service
parent a5dc57c0c3
commit 8abedf263e
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/engine_plugin.cc
+17 -7
View File
@@ -297,14 +297,24 @@ std::string_view GlobalTable<mjpDecoder>::ObjectKey(const mjpDecoder& decoder) {
// return true if two resource providers are identical // return true if two resource providers are identical
template <> template <>
bool GlobalTable<mjpDecoder>::ObjectEqual(const mjpDecoder& d1, const mjpDecoder& d2) { bool GlobalTable<mjpDecoder>::ObjectEqual(const mjpDecoder& d1, const mjpDecoder& d2) {
// check if two resource providers are identical // check content_type
if (!(CaseInsensitiveEqual(d1.content_type, d2.content_type) && bool content_type_match = false;
CaseInsensitiveEqual(d1.extension, d2.extension) && if (d1.content_type && d2.content_type) {
d1.decode == d2.decode && content_type_match = CaseInsensitiveEqual(d1.content_type, d2.content_type);
d1.can_decode == d2.can_decode)) { } else {
return false; content_type_match = (d1.content_type == d2.content_type);
} }
return true;
// check extension
bool extension_match = false;
if (d1.extension && d2.extension) {
extension_match = CaseInsensitiveEqual(d1.extension, d2.extension);
} else {
extension_match = (d1.extension == d2.extension);
}
return content_type_match && extension_match && d1.decode == d2.decode &&
d1.can_decode == d2.can_decode;
} }
template <> template <>