[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - extensions/source
Tomaž Vajngerl (via logerrit)
logerrit at kemper.freedesktop.org
Thu Apr 18 05:51:54 UTC 2019
extensions/source/macosx/spotlight/OOoContentDataParser.m | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit e6212862e3ace07136d4c68ee813696f3c6a2aef
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon Apr 15 13:14:53 2019 +0900
Commit: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Thu Apr 18 14:50:31 2019 +0900
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)
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;
}
}
More information about the Libreoffice-commits
mailing list