Merge branch 'main' into b61238

rdkcentral · Oct 2, 2024 · 8fd00de · 8fd00de
2 parents b8f9911 + f8d965e
commit 8fd00de
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/rbus/rbus_config.c b/src/rbus/rbus_config.c
@@ -98,8 +98,8 @@ int rbusConfig_ReadGetTimeout()
     {
         fp = fopen(RBUS_GET_TIMEOUT_OVERRIDE, "r");
         if(fp != NULL) {
-            fread(buf, 1, sizeof(buf), fp);
-            timeout = atoi(buf);
+            if (fread(buf, 1, sizeof(buf), fp) > 0)
+                timeout = atoi(buf);
             fclose(fp);
         }
         if (timeout > 0)
@@ -119,8 +119,8 @@ int rbusConfig_ReadWildcardGetTimeout()
     {
         fp = fopen(RBUS_GET_WILDCARD_TIMEOUT_OVERRIDE, "r");
         if(fp != NULL) {
-            fread(buf, 1, sizeof(buf), fp);
-            timeout = atoi(buf);
+            if (fread(buf, 1, sizeof(buf), fp) > 0)
+                timeout = atoi(buf);
             fclose(fp);
         }
         if (timeout > 0)
@@ -140,8 +140,8 @@ int rbusConfig_ReadSetTimeout()
     {
         fp = fopen(RBUS_SET_TIMEOUT_OVERRIDE, "r");
         if(fp != NULL) {
-            fread(buf, 1, sizeof(buf), fp);
-            timeout = atoi(buf);
+            if (fread(buf, 1, sizeof(buf), fp) > 0)
+                timeout = atoi(buf);
             fclose(fp);
         }
         if (timeout > 0)

diff --git a/src/rtmessage/rtConnection.c b/src/rtmessage/rtConnection.c
@@ -1836,11 +1836,7 @@ static void * rtConnection_ReaderThread(void *data)
   while (1 == GetRunThreadsSync(con))
   {
     rtTime_Now(&con->reader_reconnect_time);
-    #ifdef WITH_SPAKE2
-    if((err = rtConnection_Read(con, 60000)) != RT_OK)
-    #else
     if((err = rtConnection_Read(con, -1)) != RT_OK)
-    #endif
     {
       if (0 == GetRunThreadsSync(con))
       {