Update with a few additional coverity fixes

esnacc · Jul 27, 2015 · 6e35928 · 6e35928
1 parent fe601fa
commit 6e35928
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,4 +22,3 @@ addons:
 script: 
    - ./configure 
    - make
-   - ./scan_script.sh
diff --git a/c++-lib/src/asn-buf.cpp b/c++-lib/src/asn-buf.cpp
@@ -617,7 +617,7 @@ template<>
 bool std::greater<SNACC::AsnBuf>::operator()(const SNACC::AsnBuf &x,
                                              const SNACC::AsnBuf &y) const
 {
-   AsnLen len;
+   AsnLen len(0);
    AsnTag xTag = (BDecTag(x, len) & 0xDFFFFFFF);
    AsnTag yTag = (BDecTag(y, len) & 0xDFFFFFFF);
 

diff --git a/c++-lib/src/asn-int.cpp b/c++-lib/src/asn-int.cpp
@@ -1466,7 +1466,7 @@ AsnLen AsnInt::PEncFullyConstrained(AsnBufBits &b, long lowerBound, long upperBo
 					tempInt2.m_len--;
 				}
 
-				if((unsigned)minBitsNeeded > (tempInt.m_len * 8))
+				if((unsigned)minBitsNeeded > (tempInt2.m_len * 8))
 				{
 					len += b.PutBits(pChar, minBitsNeeded - (tempInt2.m_len * 8)); 
 					minBitsNeeded -= (minBitsNeeded - (tempInt2.m_len * 8));

diff --git a/c++-lib/src/asn-octs.cpp b/c++-lib/src/asn-octs.cpp
@@ -708,7 +708,7 @@ void ConsStringDeck::Fill(const AsnBuf &b, AsnLen elmtLen, AsnLen &bytesDecoded)
             }
         } /* end of for */
 
-        if( curr != refList.begin() )
+        if( curr != refList.begin() && curr != refList.end() )
         {
             int iTmpCount = curr->count;
             curr = refList.erase(curr);

diff --git a/c++-lib/src/asn-real.cpp b/c++-lib/src/asn-real.cpp
@@ -859,7 +859,7 @@ void AsnReal::BDecContent (const AsnBuf &b, AsnTag /* tagId */, AsnLen elmtLen,
                         exponent = (-1 <<8) | firstExpOctet;
                     else
                         exponent = firstExpOctet;
-                    for (;i > 0; firstExpOctet--)
+                    for (;i > 0; firstExpOctet--, i--)
                         exponent = (exponent << 8) | b.GetByte();
                     break;
             }

diff --git a/scan_script.sh b/scan_script.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e