Control: tags -1 + patch

Juhani Numminen kirjoitti 05.12.2017 klo 12:54:
> https://github.com/OpenMAMA/OpenMAMA/commit/46345f6d78

I put that into the attached patch.

--
Juhani
Description: Fixes FTBFS with GCC-7.
 Cherry-picked from upstream:
 LLVM 5.1 Fixes - pointer dereference
 .
 XCode 5.1 update includes LLVM 5.1 (CLang 3.4) which now fires a number of build
 errors.
 .
 Number of files dealing with partid on multi participant feeds do not dereference
 the pointer to the last dot char, before comparing to the null terminating
 character.  Compiler throws an error comparison of pointer against int.
Author: Phil Preston <[email protected]>
Origin: https://github.com/OpenMAMA/OpenMAMA/commit/46345f6d78f4de43137c4ed00da3d6501529b292
Bug-Debian: https://bugs.debian.org/853594
Last-Update: 2017-12-18

--- a/mamda/c_cpp/src/cpp/MamdaMultiParticipantManager.cpp
+++ b/mamda/c_cpp/src/cpp/MamdaMultiParticipantManager.cpp
@@ -367,7 +367,7 @@
         
         if (lastDot)
         {
-            if (lastDot+1 != '\0')
+            if (lastDot[1] != '\0')
                 partId = lastDot +1;
         }
         
--- a/mamda/c_cpp/src/cpp/MamdaUtils.cpp
+++ b/mamda/c_cpp/src/cpp/MamdaUtils.cpp
@@ -62,7 +62,7 @@
 
             if (lastDot!= NULL)
             {
-                if (lastDot+1 != '\0')
+                if (lastDot[1] != '\0')
                 {
                     partId = lastDot+1;
                 }
--- a/mamda/c_cpp/src/cpp/orderbooks/MamdaBookAtomicListener.cpp
+++ b/mamda/c_cpp/src/cpp/orderbooks/MamdaBookAtomicListener.cpp
@@ -534,7 +534,7 @@
                 const char* lastDot = strrchr (symbol, '.');
                 if (lastDot!= NULL)
                 {
-                    if (lastDot+1 != '\0')
+                    if (lastDot[1] != '\0')
                     {
                         partId = lastDot+1;
                         mPartId = partId;

Reply via email to