averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dynamic casting: fix an overrelease in object-to-value casting via bridging.

Browse Source 
When the dynamic cast caller asked to take on success but not destroy
on failure, we still performed the release on failure. Test case to
follow.


Swift SVN r20975
This commit is contained in:
Doug Gregor
2014-08-03 19:51:27 +00:00
parent 4c0075f5bd
commit c25eac69c2
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
stdlib/runtime/Casting.cpp
View File

@@ -1817,7 +1817,8 @@ static bool _dynamicCastClassToValueViaObjCBridgeable(
targetType);
// Dynamic cast the source object to the class type to which the target value
// type is bridged. If we succeed, we
// type is bridged. If we succeed, we can bridge from there; if we fail,
// there's nothing more to do.
void *srcObject = *reinterpret_cast<void * const *>(src);
DynamicCastFlags classCastFlags = flags;
void *srcBridgedObject = nullptr;
@@ -1829,8 +1830,8 @@ static bool _dynamicCastClassToValueViaObjCBridgeable(
// Unless we're always supposed to consume the input, retain the
// object because the witness takes it at +1.
bool alwaysConsumeSrc = (flags & (DynamicCastFlags::TakeOnSuccess |
DynamicCastFlags::DestroyOnFailure));
bool alwaysConsumeSrc = (flags & DynamicCastFlags::TakeOnSuccess) &&
(flags & DynamicCastFlags::DestroyOnFailure);
if (!alwaysConsumeSrc) {
swift_unknownRetain(srcBridgedObject);
}
@@ -1882,11 +1883,8 @@ static bool _dynamicCastClassToValueViaObjCBridgeable(
// Unless we're always supposed to consume the input, release the
// input if we need to now.
if (!alwaysConsumeSrc) {
if ((success && (flags & DynamicCastFlags::TakeOnSuccess)) ||
(!success && (flags & DynamicCastFlags::DestroyOnFailure))) {
swift_unknownRelease(srcBridgedObject);
}
if (!alwaysConsumeSrc && shouldDeallocateSource(success, flags)) {
swift_unknownRelease(srcBridgedObject);
}
return success;