[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - extensions/source

[Tomaž Vajngerl (via logerrit)]

 extensions/source/macosx/spotlight/OOoContentDataParser.m |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 9566be49c249f95d58eaf888fcaa3c48607cad7c
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon Apr 15 13:14:53 2019 +0900
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Apr 24 11:16:05 2019 +0200

    tdf#122172 set textContent to nil in OOoContentDataProvider
    
    This should prevent the crash - at least it did for me AFAICS.
    
    Change-Id: I489264d8054e6577b948b0ab307c863d3140788a
    Reviewed-on: https://gerrit.libreoffice.org/70755
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    (cherry picked from commit 9f392d0c09bd946e4660ccc2d48ee3ae1367343c)
    Reviewed-on: https://gerrit.libreoffice.org/70914
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.m b/extensions/source/macosx/spotlight/OOoContentDataParser.m
index d394115a3010..89d92a8c126a 100644
--- a/extensions/source/macosx/spotlight/OOoContentDataParser.m
+++ b/extensions/source/macosx/spotlight/OOoContentDataParser.m
@@ -98,6 +98,7 @@
 
         [textContent appendString:[NSString stringWithString:runningTextContent]];
         [runningTextContent release];
+        runningTextContent = nil;
     }
     shouldReadCharacters = NO;
 }
@@ -125,9 +126,11 @@
 
     if (runningTextContent != nil) {
         [runningTextContent release];
+        runningTextContent = nil;
     }
     if (textContent != nil) {
         [textContent release];
+        textContent = nil;
     }
 }
 
@@ -137,6 +140,7 @@
     if (textContent != nil && [textContent length] > 0) {
         [mdiValues setObject:[NSString stringWithString:textContent] forKey:(NSString*)kMDItemTextContent];
         [textContent release];
+        textContent = nil;
     }
 }