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

Tor Lillqvist tml at collabora.com
Thu Jan 16 01:01:27 PST 2014


 extensions/source/macosx/spotlight/OOoMetaDataParser.m |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b591830c3cba2698aee26b806214e229db4c4483
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 14 13:53:03 2014 +0200

    fdo#47689: Avoid crashing mdworker: Don't use uninitialized variable
    
    It's the isCustom field that should be checked to see whether the
    customAttribute field has been assigned or not.
    
    Change-Id: I5d2af26b675ab0cbc0e1844eb98ebaf5145eb73d
    Reviewed-on: https://gerrit.libreoffice.org/7418
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/extensions/source/macosx/spotlight/OOoMetaDataParser.m b/extensions/source/macosx/spotlight/OOoMetaDataParser.m
index a6ce40a..0f1bad9 100644
--- a/extensions/source/macosx/spotlight/OOoMetaDataParser.m
+++ b/extensions/source/macosx/spotlight/OOoMetaDataParser.m
@@ -172,7 +172,7 @@ static NSDictionary *metaXML2MDIKeys;
         }
         // cleanup part 1
         [textCurrentElement release];
-        if (customAttribute != nil) {
+        if (isCustom == YES) {
             [customAttribute release];
         }
     }


More information about the Libreoffice-commits mailing list