Skip to content

Make ivar references safer #3555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 12, 2019
Merged

Make ivar references safer #3555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions GoogleDataTransport/GDTLibrary/GDTStorage.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,10 +246,25 @@ - (instancetype)initWithCoder:(NSCoder *)aDecoder {

- (void)encodeWithCoder:(NSCoder *)aCoder {
GDTStorage *sharedInstance = [self.class sharedInstance];
dispatch_sync(sharedInstance.storageQueue, ^{
[aCoder encodeObject:sharedInstance->_storedEvents forKey:kGDTStorageStoredEventsKey];
[aCoder encodeObject:sharedInstance->_targetToEventSet forKey:kGDTStorageTargetToEventSetKey];
[aCoder encodeObject:sharedInstance->_uploadCoordinator forKey:kGDTStorageUploadCoordinatorKey];
dispatch_queue_t storageQueue = sharedInstance.storageQueue;
if (!storageQueue) {
return;
}
dispatch_sync(storageQueue, ^{
NSMutableOrderedSet<GDTStoredEvent *> *storedEvents = sharedInstance->_storedEvents;
if (storedEvents) {
[aCoder encodeObject:storedEvents forKey:kGDTStorageStoredEventsKey];
}
NSMutableDictionary<NSNumber *, NSMutableSet<GDTStoredEvent *> *> *targetToEventSet =
sharedInstance->_targetToEventSet;
if (targetToEventSet) {
[aCoder encodeObject:sharedInstance->_targetToEventSet forKey:kGDTStorageTargetToEventSetKey];
}
GDTUploadCoordinator *uploadCoordinator = sharedInstance->_uploadCoordinator;
if (uploadCoordinator) {
[aCoder encodeObject:sharedInstance->_uploadCoordinator
forKey:kGDTStorageUploadCoordinatorKey];
}
});
}

Expand Down
54 changes: 38 additions & 16 deletions GoogleDataTransport/GDTLibrary/GDTUploadCoordinator.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,32 +208,54 @@ - (void)appWillTerminate:(GDTApplication *)application {
#pragma mark - GDTUploadPackageProtocol

- (void)packageDelivered:(GDTUploadPackage *)package successful:(BOOL)successful {
dispatch_async(_coordinationQueue, ^{
dispatch_queue_t coordinationQueue = _coordinationQueue;
if (!_coordinationQueue) {
return;
}
dispatch_async(coordinationQueue, ^{
NSNumber *targetNumber = @(package.target);
[self->_targetToInFlightPackages removeObjectForKey:targetNumber];
id<GDTPrioritizer> prioritizer = self->_registrar.targetToPrioritizer[targetNumber];
if (!prioritizer) {
GDTLogError(GDTMCEPrioritizerError, @"A prioritizer should be registered for this target: %@",
targetNumber);
NSMutableDictionary<NSNumber *, GDTUploadPackage *> *targetToInFlightPackages =
self->_targetToInFlightPackages;
GDTRegistrar *registrar = self->_registrar;
if (targetToInFlightPackages) {
[targetToInFlightPackages removeObjectForKey:targetNumber];
}
if ([prioritizer respondsToSelector:@selector(packageDelivered:successful:)]) {
[prioritizer packageDelivered:package successful:successful];
if (registrar) {
id<GDTPrioritizer> prioritizer = registrar.targetToPrioritizer[targetNumber];
if (!prioritizer) {
GDTLogError(GDTMCEPrioritizerError,
@"A prioritizer should be registered for this target: %@", targetNumber);
}
if ([prioritizer respondsToSelector:@selector(packageDelivered:successful:)]) {
[prioritizer packageDelivered:package successful:successful];
}
}
[self.storage removeEvents:package.events];
});
}

- (void)packageExpired:(GDTUploadPackage *)package {
dispatch_async(_coordinationQueue, ^{
dispatch_queue_t coordinationQueue = _coordinationQueue;
if (!_coordinationQueue) {
return;
}
dispatch_async(coordinationQueue, ^{
NSNumber *targetNumber = @(package.target);
[self->_targetToInFlightPackages removeObjectForKey:targetNumber];
id<GDTPrioritizer> prioritizer = self->_registrar.targetToPrioritizer[targetNumber];
id<GDTUploader> uploader = self->_registrar.targetToUploader[targetNumber];
if ([prioritizer respondsToSelector:@selector(packageExpired:)]) {
[prioritizer packageExpired:package];
NSMutableDictionary<NSNumber *, GDTUploadPackage *> *targetToInFlightPackages =
self->_targetToInFlightPackages;
GDTRegistrar *registrar = self->_registrar;
if (targetToInFlightPackages) {
[targetToInFlightPackages removeObjectForKey:targetNumber];
}
if ([uploader respondsToSelector:@selector(packageExpired:)]) {
[uploader packageExpired:package];
if (registrar) {
id<GDTPrioritizer> prioritizer = registrar.targetToPrioritizer[targetNumber];
id<GDTUploader> uploader = registrar.targetToUploader[targetNumber];
if ([prioritizer respondsToSelector:@selector(packageExpired:)]) {
[prioritizer packageExpired:package];
}
if ([uploader respondsToSelector:@selector(packageExpired:)]) {
[uploader packageExpired:package];
}
}
});
}
Expand Down