cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaz...@apache.org
Subject ios commit: CB-6897 - nil callbackId in isValidCallbackId() causes regex match to throw exception
Date Wed, 27 Aug 2014 05:03:37 GMT
Repository: cordova-ios
Updated Branches:
  refs/heads/master f847b7447 -> 544c0d481


CB-6897 - nil callbackId in isValidCallbackId() causes regex match to throw exception


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/544c0d48
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/544c0d48
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/544c0d48

Branch: refs/heads/master
Commit: 544c0d481c3608c5649ef453df7e05f2a8b485ed
Parents: f847b74
Author: Shazron Abdullah <shazron@apache.org>
Authored: Tue Aug 26 22:03:30 2014 -0700
Committer: Shazron Abdullah <shazron@apache.org>
Committed: Tue Aug 26 22:03:30 2014 -0700

----------------------------------------------------------------------
 CordovaLib/Classes/CDVCommandDelegateImpl.m | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/544c0d48/CordovaLib/Classes/CDVCommandDelegateImpl.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVCommandDelegateImpl.m b/CordovaLib/Classes/CDVCommandDelegateImpl.m
index 07100a2..76f5ef4 100644
--- a/CordovaLib/Classes/CDVCommandDelegateImpl.m
+++ b/CordovaLib/Classes/CDVCommandDelegateImpl.m
@@ -99,6 +99,10 @@
 {
     NSError* err = nil;
 
+    if (callbackId == nil) {
+        return NO;
+    }
+
     // Initialize on first use
     if (_callbackIdPattern == nil) {
         // Catch any invalid characters in the callback id.


Mime
View raw message