mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#161461 stop crashing by retaining NSString

Browse Source 
OUStringToNSString() returns an autoreleased NSString so it
needs to be retained for the life of maOfficeOnlyTypes.

Change-Id: Ic3777f818b7cada8e88e97965531fc0a7f2e825c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169284
Tested-by: Jenkins
Reviewed-by: Patrick Luby <guibomacdev@gmail.com>
This commit is contained in:
Patrick Luby
2024-06-20 11:11:54 -04:00
committed by Patrick Luby
parent 9288a75f71
commit dd86e0a51a
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vcl/ios/DataFlavorMapping.cxx
View File

@@ -421,10 +421,17 @@ NSString* DataFlavorMapper::openOfficeToSystemFlavor(const DataFlavor& oOOFlavor
OfficeOnlyTypes::const_iterator it = maOfficeOnlyTypes.find(oOOFlavor.MimeType);
if (it == maOfficeOnlyTypes.end())
sysFlavor = maOfficeOnlyTypes[oOOFlavor.MimeType]
= OUStringToNSString(oOOFlavor.MimeType);
{
// tdf#161461 stop crashing by retaining NSString
// OUStringToNSString() returns an autoreleased NSString so it
// needs to be retained for the life of maOfficeOnlyTypes.
sysFlavor = maOfficeOnlyTypes[oOOFlavor.MimeType] =
[OUStringToNSString(oOOFlavor.MimeType) retain];
}
else
{
sysFlavor = it->second;
}
}
return sysFlavor;

10
vcl/osx/DataFlavorMapping.cxx
View File

@@ -586,9 +586,17 @@ const NSString* DataFlavorMapper::openOfficeToSystemFlavor( const DataFlavor& oO
OfficeOnlyTypes::const_iterator it = maOfficeOnlyTypes.find( oOOFlavor.MimeType );
if( it == maOfficeOnlyTypes.end() )
sysFlavor = maOfficeOnlyTypes[ oOOFlavor.MimeType ] = OUStringToNSString( oOOFlavor.MimeType );
{
// tdf#161461 stop crashing by retaining NSString
// OUStringToNSString() returns an autoreleased NSString so it
// needs to be retained for the life of maOfficeOnlyTypes.
sysFlavor = maOfficeOnlyTypes[oOOFlavor.MimeType] =
[OUStringToNSString(oOOFlavor.MimeType) retain];
}
else
{
sysFlavor = it->second;
}
}
return sysFlavor;