Merge remote-tracking branch 'origin/candidate-9.8.x'

Signed-off-by: Gordon Smith <[email protected]>
hpcc-systems · Dec 5, 2024 · fd44530 · fd44530
2 parents 38456ac + 0e81120
commit fd44530
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml
@@ -444,7 +444,7 @@ jobs:
             sudo: ""
             cmake_config_options: '-T host=x64 -A x64 -DUSE_OPTIONAL=OFF -DCLIENTTOOLS_ONLY=ON -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_PARQUET=OFF -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF'
             cmake_build_options: "--config Release --parallel $NUMBER_OF_PROCESSORS"
-          - os: "macos-12"
+          - os: "macos-13"
             mono: "mono"
             sudo: "sudo"
             cmake_config_options: "-DCMAKE_BUILD_TYPE=Release -DUSE_OPTIONAL=OFF -DCLIENTTOOLS_ONLY=ON -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_PARQUET=OFF -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF"

diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml
@@ -198,20 +198,20 @@ jobs:
       cmake-configuration-ex: '-T host=x64 -A x64 -DUSE_CPPUNIT=OFF -DCLIENTTOOLS_ONLY=ON -DINCLUDE_PLUGINS=OFF -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_PARQUET=OFF -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF'
     secrets: inherit
 
-  build-gh_runner-macos-13:
+  build-gh_runner-macos-14:
     if: ${{ contains('pull_request,push', github.event_name) }}
     uses: ./.github/workflows/build-gh_runner.yml
     with:
-      os: macos-13
+      os: macos-14
       build-type: 'Release'
       cmake-configuration-ex: '-DUSE_CPPUNIT=OFF -DCLIENTTOOLS_ONLY=ON -DINCLUDE_PLUGINS=OFF -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_PARQUET=OFF -DSUPPRESS_CASSANDRAEMBED=ON -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF'
     secrets: inherit
 
-  build-gh_runner-macos-12:
+  build-gh_runner-macos-13:
     if: ${{ contains('schedule,push', github.event_name) }}
     uses: ./.github/workflows/build-gh_runner.yml
     with:
-      os: macos-12
+      os: macos-13
       build-type: 'Release'
       cmake-configuration-ex: '-DUSE_CPPUNIT=OFF -DCLIENTTOOLS_ONLY=ON -DINCLUDE_PLUGINS=OFF -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_PARQUET=OFF -DSUPPRESS_CASSANDRAEMBED=ON -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF'
     secrets: inherit

diff --git a/system/jlib/jfile.cpp b/system/jlib/jfile.cpp
@@ -8022,6 +8022,8 @@ const char *getPlaneAttributeString(PlaneAttributeType attr)
 
 unsigned __int64 getPlaneAttributeValue(const char *planeName, PlaneAttributeType planeAttrType, unsigned __int64 defaultValue)
 {
+    if (!planeName)
+        return defaultValue;
     assertex(planeAttrType < PlaneAttributeCount);
     CriticalBlock b(planeAttributeMapCrit);
     auto it = planeAttributesMap.find(planeName);

diff --git a/system/jlib/jtrace.hpp b/system/jlib/jtrace.hpp
@@ -164,11 +164,17 @@ class jlib_decl OwnedSpanScope
 public:
     OwnedSpanScope() = default;
     OwnedSpanScope(ISpan * _ptr);
+    OwnedSpanScope(const OwnedSpanScope& rhs) = delete;
+    OwnedSpanScope(OwnedSpanScope&& rhs) = default;
     ~OwnedSpanScope();
 
     inline ISpan * operator -> () const         { return span; }
     inline operator ISpan *() const             { return span; }
 
+    inline OwnedSpanScope& operator=(ISpan * ptr) = delete;
+    inline OwnedSpanScope& operator=(const OwnedSpanScope& rhs) = delete;
+    inline OwnedSpanScope& operator=(OwnedSpanScope&& rhs) = delete;
+
     void clear();
     ISpan * query() const { return span; }
     void set(ISpan * _span);

diff --git a/system/security/securesocket/securesocket.cpp b/system/security/securesocket/securesocket.cpp
@@ -770,6 +770,7 @@ void CSecureSocket::handleError(int ssl_err, bool writing, bool wait, unsigned t
 {
     // if !wait, then we only perform ssl_err checking, we do not wait_read/wait_write or timeout
     int rc = 0;
+    int sockErr = 0;
     switch (ssl_err)
     {
         case SSL_ERROR_ZERO_RETURN:
@@ -791,7 +792,7 @@ void CSecureSocket::handleError(int ssl_err, bool writing, bool wait, unsigned t
         }
         case SSL_ERROR_SYSCALL:
         {
-            int sockErr = SOCKETERRNO();
+            sockErr = SOCKETERRNO();
             if (sockErr == EAGAIN || sockErr == EWOULDBLOCK)
             {
                 if (wait)
@@ -810,7 +811,7 @@ void CSecureSocket::handleError(int ssl_err, bool writing, bool wait, unsigned t
             char errbuf[512];
             ERR_error_string_n(ssl_err, errbuf, 512);
             ERR_clear_error();
-            VStringBuffer errmsg("%s error %d - %s", opStr, ssl_err, errbuf);
+            VStringBuffer errmsg("%s error %d (%d) - %s", opStr, ssl_err, sockErr, errbuf);
             if (m_loglevel >= SSLogMax)
                 DBGLOG("Warning: %s", errmsg.str());
             THROWJSOCKEXCEPTION_MSG(ssl_err, errmsg);