HPCC-30956 Prevent an invalid trusted_peer from crashing the system

Signed-off-by: Gavin Halliday <[email protected]>
hpcc-systems · Dec 1, 2023 · 5354e51 · 5354e51
1 parent b330baf
commit 5354e51
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/system/security/securesocket/securesocket.cpp b/system/security/securesocket/securesocket.cpp
@@ -1413,34 +1413,28 @@ class CSecureSocketContext : implements ISecureSocketContext, implements ISecure
                     if(onepeerbuf.length() == 0)
                         break;
 
-                    char*  onepeer = onepeerbuf.detach();
+                    const char * onepeer = onepeerbuf.str();
                     if (isdigit(*onepeer))
                     {
-                        char *dash = strrchr(onepeer, '-');
-                        if (dash)
+                        const char *dash = strrchr(onepeer, '-');
+                        const char *dot = strrchr(onepeer, '.');
+                        //Allow a range in the form a.b.c.d-e
+                        if (dash && dot && dot < dash)
                         {
-                            *dash = 0;
-                            int last = atoi(dash+1);
-                            char *dot = strrchr(onepeer, '.');
-                            *dot = 0;
                             int first = atoi(dot+1);
+                            int last = atoi(dash+1);
                             for (int i = first; i <= last; i++)
                             {
                                 StringBuffer t;
-                                t.append(onepeer).append('.').append(i);
+                                t.append(dot-onepeer, onepeer).append('.').append(i);
                                 m_peers->add(t.str());
                             }
                         }
                         else
-                        {
                             m_peers->add(onepeer);
-                        }
                     }
                     else
-                    {
                         m_peers->add(onepeer);
-                    }
-                    free(onepeer);
                 }
             }
         }