Fix null pointer exception for external client.

mobizt · Sep 12, 2023 · ac006e6 · ac006e6
1 parent f2753c6
commit ac006e6
Show file tree

Hide file tree

Showing 31 changed files with 56 additions and 51 deletions.
diff --git a/examples/ExternalClient/Generic/Basic/Basic.ino b/examples/ExternalClient/Generic/Basic/Basic.ino
@@ -54,7 +54,7 @@ void networkConnection()
 void networkStatusRequestCallback()
 {
     // Set the network status based on your network client
-    fbdo.setNetworkStatus(true/* or false */);
+    fbdo.setNetworkStatus(false /* or true */);
 }
 
 void setup()

diff --git a/examples/ExternalClient/Generic/StreamCallback/StreamCallback.ino b/examples/ExternalClient/Generic/StreamCallback/StreamCallback.ino
@@ -57,8 +57,8 @@ void networkConnection()
 void networkStatusRequestCallback()
 {
     // Set the network status based on your network client
-    fbdo.setNetworkStatus(true /* or false */);
-    stream.setNetworkStatus(true /* or false */);
+    fbdo.setNetworkStatus(false /* or true */);
+    stream.setNetworkStatus(false /* or true */);
 }
 
 void streamCallback(StreamData data)

diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "Firebase ESP32 Client",
-  "version": "4.4.3",
+  "version": "4.4.4",
   "keywords": "communication, REST, esp32, arduino",
   "description": "The secure, fast and reliable Firebase Realtime database library to read, store, update, delete, listen, backup, and restore data. You can also read and modify the database security rules with this library.",
   "repository": {

diff --git a/library.properties b/library.properties
@@ -1,6 +1,6 @@
 name=Firebase ESP32 Client
 
-version=4.4.3
+version=4.4.4
 
 author=Mobizt
 

diff --git a/src/FB_Const.h b/src/FB_Const.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/FB_Error.h b/src/FB_Error.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/FB_Network.h b/src/FB_Network.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/FB_Utils.h b/src/FB_Utils.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/Firebase.cpp b/src/Firebase.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/Firebase.h b/src/Firebase.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/FirebaseFS.h b/src/FirebaseFS.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/core/FirebaseCore.cpp b/src/core/FirebaseCore.cpp
@@ -1,12 +1,12 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 
 /**
- * Google's Firebase Token Management class, FirebaseCore.cpp version 1.0.0
+ * Google's Firebase Token Management class, FirebaseCore.cpp version 1.0.1
  *
- * Created September 5, 2023
+ * Created September 12, 2023
  *
  * The MIT License (MIT)
  * Copyright (c) 2023 K. Suwatchai (Mobizt)
@@ -939,9 +939,15 @@ void FirebaseCore::freeClient(Firebase_TCP_Client **client)
             _password = (*client)->_password;
 #endif
         }
-        delete *client;
+
+        // Only internal client can be deleted
+        if (_cli_type == firebase_client_type_internal_basic_client)
+            delete *client;
     }
-    *client = nullptr;
+
+    // Reset pointer in case internal client
+    if (_cli_type == firebase_client_type_internal_basic_client)
+        *client = nullptr;
 }
 
 void FirebaseCore::setTokenError(int code)
@@ -1708,12 +1714,12 @@ bool FirebaseCore::reconnect()
     // otherwise the networkStatus will not update
     // and network cannot resume.
 
-     if (noClient)
+    if (noClient)
         newClient(&tcpClient);
 
-     reconnect(tcpClient, nullptr);
+    reconnect(tcpClient, nullptr);
 
-     if (noClient)
+    if (noClient)
         freeClient(&tcpClient);
 
     networkChecking = false;

diff --git a/src/core/FirebaseCore.h b/src/core/FirebaseCore.h
@@ -1,12 +1,12 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 
 /**
- * Google's Firebase Token Management class, FirebaseCore.h version 1.0.0
+ * Google's Firebase Token Management class, FirebaseCore.h version 1.0.1
  * 
- * Created September 5, 2023
+ * Created September 12, 2023
  *
  * The MIT License (MIT)
  * Copyright (c) 2023 K. Suwatchai (Mobizt)

diff --git a/src/core/Firebase_Client_Version.h b/src/core/Firebase_Client_Version.h
@@ -1,6 +1,6 @@
 #ifndef FIREBASE_CLIENT_VERSION
-#define FIREBASE_CLIENT_VERSION "4.4.3"
-#define FIREBASE_CLIENT_VERSION_NUM 40403
+#define FIREBASE_CLIENT_VERSION "4.4.4"
+#define FIREBASE_CLIENT_VERSION_NUM 40404
 
 /* The inconsistent file version checking to prevent mixed versions compilation. */
 #define FIREBASE_CLIENT_VERSION_CHECK(ver) (ver == FIREBASE_CLIENT_VERSION_NUM)

diff --git a/src/message/FCM.cpp b/src/message/FCM.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/message/FCM.h b/src/message/FCM.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/message/LFCM.h b/src/message/LFCM.h
@@ -1,6 +1,6 @@
 
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/FB_RTDB.cpp b/src/rtdb/FB_RTDB.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/FB_RTDB.h b/src/rtdb/FB_RTDB.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/QueryFilter.cpp b/src/rtdb/QueryFilter.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/QueryFilter.h b/src/rtdb/QueryFilter.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/QueueInfo.cpp b/src/rtdb/QueueInfo.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/QueueInfo.h b/src/rtdb/QueueInfo.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/QueueManager.cpp b/src/rtdb/QueueManager.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/QueueManager.h b/src/rtdb/QueueManager.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/stream/FB_MP_Stream.cpp b/src/rtdb/stream/FB_MP_Stream.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/stream/FB_MP_Stream.h b/src/rtdb/stream/FB_MP_Stream.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/stream/FB_Stream.cpp b/src/rtdb/stream/FB_Stream.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/rtdb/stream/FB_Stream.h b/src/rtdb/stream/FB_Stream.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/session/FB_Session.cpp b/src/session/FB_Session.cpp
@@ -1,12 +1,12 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 
 /**
- * Google's Firebase Data class, FB_Session.cpp version 1.4.0
+ * Google's Firebase Data class, FB_Session.cpp version 1.4.1
  *
- * Created September 5, 2023
+ * Created September 12, 2023
  *
  * The MIT License (MIT)
  * Copyright (c) 2023 K. Suwatchai (Mobizt)
@@ -74,14 +74,13 @@ FirebaseData::~FirebaseData()
 void FirebaseData::setGenericClient(Client *client, FB_NetworkConnectionRequestCallback networkConnectionCB,
                                     FB_NetworkStatusRequestCallback networkStatusCB)
 {
-    if (client)
+    if (client && networkConnectionCB && networkStatusCB)
     {
         _client = client;
-        Core.setTCPClient(&tcpClient);
+        tcpClient.setClient(_client, networkConnectionCB, networkStatusCB);
     }
-
-    if (_networkConnectionCB && _networkStatusCB)
-        tcpClient.setClient(_client, _networkConnectionCB, _networkStatusCB);
+    // Client type shall be set before calling this.
+    Core.setTCPClient(&tcpClient);
 }
 
 void FirebaseData::setGSMClient(Client *client, void *modem, const char *pin, const char *apn, const char *user, const char *password)

diff --git a/src/session/FB_Session.h b/src/session/FB_Session.h
@@ -1,12 +1,12 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40404)
 #error "Mixed versions compilation."
 #endif
 
 /**
- * Google's Firebase Data class, FB_Session.h version 1.4.0
+ * Google's Firebase Data class, FB_Session.h version 1.4.1
  *
- * Created September 5, 2023
+ * Created September 12, 2023
  *
  * The MIT License (MIT)
  * Copyright (c) 2023 K. Suwatchai (Mobizt)