[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [koffice] libs/kotext/changetracker: Avoid null pointer dereference.
From:       "Dr. Robert Marmorstein" <robert () narnia ! homeunix ! com>
Date:       2011-08-02 9:16:39
Message-ID: 20110802091639.86A21A60D2 () git ! kde ! org
[Download RAW message or body]

Git commit 97facffc2bf78e7db4d10ce9bbb571d6fb57e4c9 by Dr. Robert Marmorstein.
Committed on 01/08/2011 at 18:08.
Pushed by robertm into branch 'master'.

Avoid null pointer dereference.

This should never happen, anyway, but just in case.

M  +7    -7    libs/kotext/changetracker/KDeleteChangeMarker.cpp

http://commits.kde.org/koffice/97facffc2bf78e7db4d10ce9bbb571d6fb57e4c9

diff --git a/libs/kotext/changetracker/KDeleteChangeMarker.cpp \
b/libs/kotext/changetracker/KDeleteChangeMarker.cpp index 709abaf..8084233 100644
--- a/libs/kotext/changetracker/KDeleteChangeMarker.cpp
+++ b/libs/kotext/changetracker/KDeleteChangeMarker.cpp
@@ -143,14 +143,14 @@ void KDeleteChangeMarker::saveOdf(KShapeSavingContext &context)
             kWarning(32500) << "There is no KTextSharedSavingData in the context. \
This should not be the case";  return;
         }
-    }
-    d->changeTracker->saveInlineChange(d->id, change);
-    change.addChildElement("deleteChangeXml", d->deleteChangeXml);
-    changeName = sharedData->genChanges().insert(change);
+        d->changeTracker->saveInlineChange(d->id, change);
+        change.addChildElement("deleteChangeXml", d->deleteChangeXml);
+        changeName = sharedData->genChanges().insert(change);
 
-    context.xmlWriter().startElement("text:change", false);
-    context.xmlWriter().addAttribute("text:change-id", changeName);
-    context.xmlWriter().endElement();
+        context.xmlWriter().startElement("text:change", false);
+        context.xmlWriter().addAttribute("text:change-id", changeName);
+        context.xmlWriter().endElement();
+    }
 }
 
 void KDeleteChangeMarker::setDeleteChangeXml(QString &deleteChangeXml)


[prev in list] [next in list] [prev in thread] [next in thread]