commit da84ed79890a405ce3815a42cd45aad9425f85fe
author Laurence Lundblade <lgl@securitytheory.com> Tue Feb 27 22:24:07 2024 -0700
committer Laurence Lundblade <lgl@securitytheory.com> Tue Feb 27 22:24:07 2024 -0700
tree c884d20e09da3c136a32e4ac030455a45cdd7d93
parent a691a619512f840df9776f38fe171f3dae2b06b6

rework UsefulOutBuf_Compare and test

src/UsefulBuf.c

diff --git a/src/UsefulBuf.c b/src/UsefulBuf.c
index 3c39ebd..dae4eb1 100644
--- a/src/UsefulBuf.c
+++ b/src/UsefulBuf.c
@@ -434,9 +434,9 @@
  *
  * Code Reviewers: THIS FUNCTION DOES POINTER MATH
  */
-int UsefulOutBuf_Compare(UsefulOutBuf *me,
-                         size_t uStart1, size_t uLen1,
-                         size_t uStart2, size_t uLen2)
+int UsefulOutBuf_Compare(UsefulOutBuf *pMe,
+                         const size_t uStart1, const size_t uLen1,
+                         const size_t uStart2, const size_t uLen2)
 {
    const uint8_t *pBase;
    const uint8_t *pEnd;
@@ -446,8 +446,8 @@
    const uint8_t *p2End;
    int            uComparison;
 
-   pBase = me->UB.ptr;
-   pEnd = (const uint8_t *)pBase + me->data_len;
+   pBase = pMe->UB.ptr;
+   pEnd = (const uint8_t *)pBase + pMe->data_len;
    p1   = pBase + uStart1;
    p2   = pBase + uStart2;
    p1End = p1 + uLen1;
@@ -463,6 +463,16 @@
       p2++;
    }
 
+   if(uComparison == 0 && p1 != p1End && p2 != p2End) {
+      if(uLen1 > uLen2) {
+         uComparison = 1;
+      } else if(uLen2 < uLen1){
+         uComparison = -1;
+      } else  {
+         return 0;
+      }
+   }
+
    return uComparison;
 }
 
@@ -481,7 +491,7 @@
 
    while(pStart < pEnd) {
       pEnd--;
-      uTmp     = *pStart;
+      uTmp    = *pStart;
       *pStart = *pEnd;
       *pEnd   = uTmp;
       pStart++;