handle null function pointer

chavee · chavee · commit 15b802fbabcd · 2015-10-05T22:59:08.000+07:00
diff --git a/MicroGear.cpp b/MicroGear.cpp
@@ -18,7 +18,7 @@ void msgCallback(char* topic, uint8_t* payload, unsigned int length) {
             }
         }
         else if (strcmp(rtopic,"&absent") == 0) {
-            if (cb_present) {
+            if (cb_absent) {
                 cb_absent("absent",payload,length);
             }
         }
@@ -90,6 +90,9 @@ MicroGear::MicroGear(Client& netclient ) {
 
     this->eepromoffset = 0;
     cb_message = NULL;
+    cb_connected = NULL;
+    cb_absent = NULL;
+    cb_present = NULL;
     eepromready = false;
 }
 
@@ -383,8 +386,8 @@ boolean MicroGear::connect(char* appid) {
                     sprintf(buff,"/&id/%s/#",token);
                     subscribe(buff);
 
-                    cb_connected(NULL,NULL,0);
-
+                    if (cb_connected)
+                        cb_connected(NULL,NULL,0);
 
 					break;
             case CLIENT_NOTCONNECT :

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ void msgCallback(char* topic, uint8_t* payload, unsigned int length) {`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`	`else if (strcmp(rtopic,"&absent") == 0) {`
`21`		`- if (cb_present) {`
	`21`	`+ if (cb_absent) {`
`22`	`22`	`cb_absent("absent",payload,length);`
`23`	`23`	`}`
`24`	`24`	`}`
`@@ -90,6 +90,9 @@ MicroGear::MicroGear(Client& netclient ) {`
`90`	`90`
`91`	`91`	`this->eepromoffset = 0;`
`92`	`92`	`cb_message = NULL;`
	`93`	`+ cb_connected = NULL;`
	`94`	`+ cb_absent = NULL;`
	`95`	`+ cb_present = NULL;`
`93`	`96`	`eepromready = false;`
`94`	`97`	`}`
`95`	`98`
`@@ -383,8 +386,8 @@ boolean MicroGear::connect(char* appid) {`
`383`	`386`	`sprintf(buff,"/&id/%s/#",token);`
`384`	`387`	`subscribe(buff);`
`385`	`388`
`386`		`- cb_connected(NULL,NULL,0);`
`387`		`-`
	`389`	`+ if (cb_connected)`
	`390`	`+ cb_connected(NULL,NULL,0);`
`388`	`391`
`389`	`392`	`break;`
`390`	`393`	`case CLIENT_NOTCONNECT :`