Changeset 830

Timestamp:

08/17/08 00:12:18 (4 months ago)

Author:

hobu

Message:

Fix #68 - incorrect return type for the length of the VLR in the ReadVLR functions

Location:

trunk/src/detail

Files:

• reader10.cpp (modified) (1 diff)
• reader11.cpp (modified) (2 diffs)

trunk/src/detail/reader10.cpp

@@ -224 +224 @@
         read_n(vlrh, m_ifs, sizeof(VLRHeader));
 
-        int16_t count = vlrh.recordLengthAfterHeader;
+        uint16_t length = vlrh.recordLengthAfterHeader;
+        if (length < 1) {
+            throw std::domain_error("VLR record length must be at least 1 byte long");
+        }
          
         std::vector<uint8_t> data;
-        data.resize(count);
+        data.resize(length);
 
         read_n(data.front(), m_ifs, count);

trunk/src/detail/reader11.cpp

@@ -311 +311 @@
     uint32_t count = header.GetRecordsCount();
     header.SetRecordsCount(0);
+    
     for (uint32_t i = 0; i < count; ++i)
     {
+
         read_n(vlrh, m_ifs, sizeof(VLRHeader));
-
-        int16_t count = vlrh.recordLengthAfterHeader;
+        
+
+        uint16_t length = vlrh.recordLengthAfterHeader;
+        
+        if (length < 1) {
+            throw std::domain_error("VLR record length must be at least 1 byte long");
+        }
          
         std::vector<uint8_t> data;
-        data.resize(count);
-
-        read_n(data.front(), m_ifs, count);
-         
+        data.resize(length);
+
+        read_n(data.front(), m_ifs, length);
+
         LASVLR vlr;
         vlr.SetReserved(vlrh.reserved);
@@ -331 +338 @@
 
         header.AddVLR(vlr);
-    }
-    
+
+    }
+
     return true;
 }