Merge pull request #4018 from jufrantz/fix_potential_crash_on_save_to…

…_usd_files Fix crashes when saving layers to USD files in specific edge cases.
Autodesk · Dec 3, 2024 · 652667a · 652667a
2 parents 2abaed5 + 1072bf6
commit 652667a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/lib/mayaUsd/nodes/layerManager.cpp b/lib/mayaUsd/nodes/layerManager.cpp
@@ -606,7 +606,7 @@ bool LayerDatabase::getProxiesToSave(bool isExport, bool* hasAnyProxy)
                 if (!pShape->isShareableStage() || !pShape->isStageIncoming()) {
                     SdfLayerHandleVector allLayers = stage->GetUsedLayers(true);
                     for (auto layer : allLayers) {
-                        if (layer->IsDirty()) {
+                        if (TF_VERIFY(layer) && layer->IsDirty()) {
                             StageSavingInfo info;
                             MDagPath::getAPathTo(mobj, info.dagPath);
                             info.stage = stage;
@@ -893,7 +893,8 @@ SaveStageToMayaResult saveStageToMayaFile(
     saveLayersToMayaFile(
         stage->GetUsedLayers(true),
         [&localLayerIds](const auto& layer) {
-            return localLayerIds.find(layer->GetIdentifier()) != localLayerIds.cend();
+            return TF_VERIFY(layer)
+                && localLayerIds.find(layer->GetIdentifier()) != localLayerIds.cend();
         },
         lm,
         builder,
@@ -1020,12 +1021,14 @@ BatchSaveResult LayerDatabase::saveUsdToUsdFiles()
                 const auto& sessionLayer = info.stage->GetSessionLayer();
                 const auto& allLayers = info.stage->GetUsedLayers(true);
                 for (auto layer : allLayers) {
-                    if (layer != sessionLayer && layer->PermissionToSave()) {
-                        if (!MayaUsd::utils::saveLayerWithFormat(layer)) {
-                            MString errMsg;
-                            MString layerName(layer->GetDisplayName().c_str());
-                            errMsg.format("Could not save layer ^1s.", layerName);
-                            MGlobal::displayError(errMsg);
+                    if (TF_VERIFY(layer)) {
+                        if (layer != sessionLayer && layer->PermissionToSave()) {
+                            if (!MayaUsd::utils::saveLayerWithFormat(layer)) {
+                                MString errMsg;
+                                MString layerName(layer->GetDisplayName().c_str());
+                                errMsg.format("Could not save layer ^1s.", layerName);
+                                MGlobal::displayError(errMsg);
+                            }
                         }
                     }
                 }

diff --git a/lib/mayaUsd/utils/utilSerialization.cpp b/lib/mayaUsd/utils/utilSerialization.cpp
@@ -407,7 +407,12 @@ bool saveLayerWithFormat(
         }
     }
 
-    updateAllCachedStageWithLayer(layer, filePath);
+    // Update all known stage caches if the layer was saved to a new file path.
+    // Skip this step when the layer's file path hasn't changed to avoid unnecessary stage
+    // recompositions.
+    if (!requestedFilePath.empty()) {
+        updateAllCachedStageWithLayer(layer, filePath);
+    }
 
     return true;
 }

diff --git a/lib/usdUfe/utils/layers.cpp b/lib/usdUfe/utils/layers.cpp
@@ -95,7 +95,7 @@ StageDirtyState isStageDirty(const PXR_NS::UsdStage& stage)
 
     SdfLayerHandleVector allLayers = stage.GetUsedLayers(true);
     for (auto layer : allLayers) {
-        if (!layer->IsDirty())
+        if (!TF_VERIFY(layer) || !layer->IsDirty())
             continue;
 
         if (rootLayers.count(layer))