AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CoreWLan: Fix potential unhandled exception assert

Browse Source 
-[QNSListener notificationHandler:] was declared as not taking any parameter,
but used as taking a single NSNotification. This would lead to an 'unrecognized
selector' exception raised by Cocoa.

Task-number: QTBUG-26844
Change-Id: I56d03a7738c2a1b9dcf3cdecc696b01e65d7b233
Reviewed-by: Liang Qi <liang.qi@digia.com>
This commit is contained in:
Gabriel de Dietrich 2013-11-25 13:41:49 +01:00 committed by The Qt Project
parent 939a001c3a
commit 08f3177fdf
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/bearer/corewlan/qcorewlanengine.mm
View File

@ -71,7 +71,7 @@ extern "C" { // Otherwise it won't find CWKeychain* symbols at link time
QCoreWlanEngine *engine; QCoreWlanEngine *engine;
NSLock *locker; NSLock *locker;
} }
- (void)notificationHandler;//:(NSNotification *)notification; - (void)notificationHandler:(NSNotification *)notification;
- (void)remove; - (void)remove;
- (void)setEngine:(QCoreWlanEngine *)coreEngine; - (void)setEngine:(QCoreWlanEngine *)coreEngine;
- (QCoreWlanEngine *)engine; - (QCoreWlanEngine *)engine;
@ -120,8 +120,9 @@ extern "C" { // Otherwise it won't find CWKeychain* symbols at link time
[locker unlock]; [locker unlock];
} }
- (void)notificationHandler//:(NSNotification *)notification - (void)notificationHandler:(NSNotification *)notification
{ {
Q_UNUSED(notification);
engine->requestUpdate(); engine->requestUpdate();
} }
@end @end

5
src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm
View File

@ -48,7 +48,7 @@
QCoreWlanEngine *engine; QCoreWlanEngine *engine;
NSLock *locker; NSLock *locker;
} }
- (void)notificationHandler;//:(NSNotification *)notification; - (void)notificationHandler:(NSNotification *)notification;
- (void)remove; - (void)remove;
- (void)setEngine:(QCoreWlanEngine *)coreEngine; - (void)setEngine:(QCoreWlanEngine *)coreEngine;
- (QCoreWlanEngine *)engine; - (QCoreWlanEngine *)engine;
@ -97,8 +97,9 @@
[locker unlock]; [locker unlock];
} }
- (void)notificationHandler//:(NSNotification *)notification - (void)notificationHandler:(NSNotification *)notification
{ {
Q_UNUSED(notification);
engine->requestUpdate(); engine->requestUpdate();
} }
@end @end