From c05e86de45b44ed6d4789d19c4f8b2476c511596 Mon Sep 17 00:00:00 2001 From: "Olli.Pettay%helsinki.fi" Date: Fri, 17 Apr 2009 13:07:37 +0000 Subject: [PATCH] Bug 461049, r+sr=peterv git-svn-id: svn://10.0.0.236/trunk@256942 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/editor/txmgr/src/nsTransactionItem.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/editor/txmgr/src/nsTransactionItem.cpp b/mozilla/editor/txmgr/src/nsTransactionItem.cpp index 3f11f94bbf6..c066f580b16 100644 --- a/mozilla/editor/txmgr/src/nsTransactionItem.cpp +++ b/mozilla/editor/txmgr/src/nsTransactionItem.cpp @@ -247,7 +247,7 @@ nsTransactionItem::UndoChildren(nsTransactionManager *aTxMgr) while (sz-- > 0) { result = mUndoStack->Peek(getter_AddRefs(item)); - if (NS_FAILED(result)) { + if (NS_FAILED(result) || !item) { return result; } @@ -339,7 +339,7 @@ nsTransactionItem::RedoChildren(nsTransactionManager *aTxMgr) while (sz-- > 0) { result = mRedoStack->Peek(getter_AddRefs(item)); - if (NS_FAILED(result)) { + if (NS_FAILED(result) || !item) { return result; }