Convert m_positionIdx into Option<usize>

Author: thedataking

src/lib/xmlparse.rs

@@ -803,7 +803,7 @@ pub struct XML_ParserStruct<'scf> {
     pub m_errorCode: XML_Error,
     pub m_eventPtr: *const c_char,
     pub m_eventEndPtr: *const c_char,
-    pub m_positionIdx: usize,
+    pub m_positionIdx: Option<usize>,
     pub m_openInternalEntities: *mut OpenInternalEntity,
     pub m_freeInternalEntities: *mut OpenInternalEntity,
     pub m_defaultExpandInternalEntities: XML_Bool,
@@ -1514,7 +1514,7 @@ impl<'scf> XML_ParserStruct<'scf> {
             m_errorCode: XML_Error::NONE,
             m_eventPtr: ptr::null(),
             m_eventEndPtr: ptr::null(),
-            m_positionIdx: 0,
+            m_positionIdx: None,
             m_openInternalEntities: ptr::null_mut(),
             m_freeInternalEntities: ptr::null_mut(),
             m_defaultExpandInternalEntities: false,
@@ -1628,7 +1628,7 @@ impl<'scf> XML_ParserStruct<'scf> {
         self.m_errorCode = XML_Error::NONE;
         self.m_eventPtr = ptr::null();
         self.m_eventEndPtr = ptr::null();
-        self.m_positionIdx = 0;
+        self.m_positionIdx = Some(0);
         self.m_openInternalEntities = ptr::null_mut();
         self.m_defaultExpandInternalEntities = true;
         self.m_tagLevel = 0;
@@ -2534,7 +2534,7 @@ impl<'scf> XML_ParserStruct<'scf> {
             if isFinal == 0 {
                 return XML_Status::OK;
             }
-            self.m_positionIdx = self.m_bufferStart;
+            self.m_positionIdx = Some(self.m_bufferStart);
             self.m_parseEndIdx = self.m_bufferEnd;
             /* If data are left over from last buffer, and we now know that these
             data are the final chunk of input, then we have to check them again
@@ -2563,10 +2563,10 @@ impl<'scf> XML_ParserStruct<'scf> {
                         * LCOV_EXCL_START
                         */
                         (*self.m_encoding).updatePosition(
-                            self.m_buffer[self.m_positionIdx..self.m_bufferStart].into(),
+                            self.m_buffer[self.m_positionIdx.unwrap()..self.m_bufferStart].into(),
                             &mut self.m_position,
                         );
-                        self.m_positionIdx = self.m_bufferStart;
+                        self.m_positionIdx = Some(self.m_bufferStart);
                         return XML_Status::SUSPENDED;
                     }
                     XML_Parsing::INITIALIZED | XML_Parsing::PARSING => {
@@ -2635,7 +2635,7 @@ impl<'scf> XML_ParserStruct<'scf> {
         // convert in-out parameter `start` from index to pointer
         // TODO(SJC): is signed overflow an issue here?
         start = self.m_buffer.as_ptr().add(self.m_bufferStart);
-        self.m_positionIdx = self.m_bufferStart;
+        self.m_positionIdx = Some(self.m_bufferStart);
         self.m_bufferEnd += len as usize;
         self.m_parseEndIdx = self.m_bufferEnd;
         self.m_parseEndByteIndex += len as usize;
@@ -2667,10 +2667,10 @@ impl<'scf> XML_ParserStruct<'scf> {
             }
         }
         (*self.m_encoding).updatePosition(
-            self.m_buffer[self.m_positionIdx..self.m_bufferStart].into(),
+            self.m_buffer[self.m_positionIdx.unwrap()..self.m_bufferStart].into(),
             &mut self.m_position,
         );
-        self.m_positionIdx = self.m_bufferStart;
+        self.m_positionIdx = Some(self.m_bufferStart);
         result
     }
 }
@@ -2759,7 +2759,7 @@ impl <'scf> XML_ParserStruct<'scf> {
             }
             self.m_eventEndPtr = ptr::null();
             self.m_eventPtr = ptr::null();
-            self.m_positionIdx = 0;
+            self.m_positionIdx = None;
         }
         Some(&mut self.m_buffer[self.m_bufferEnd..])
     }
@@ -2888,10 +2888,10 @@ impl<'scf> XML_ParserStruct<'scf> {
             }
         }
         (*self.m_encoding).updatePosition(
-            self.m_buffer[self.m_positionIdx..self.m_bufferStart].into(),
+            self.m_buffer[self.m_positionIdx.unwrap()..self.m_bufferStart].into(),
             &mut self.m_position,
         );
-        self.m_positionIdx = self.m_bufferStart;
+        self.m_positionIdx = Some(self.m_bufferStart);
 
         #[cfg(feature = "mozilla")]
         {
@@ -3025,7 +3025,7 @@ pub unsafe extern "C" fn XML_GetCurrentLineNumber(mut parser: XML_Parser) -> XML
     if parser.is_null() {
         return 0;
     }
-    let positionPtr = (*parser).m_buffer.as_ptr().wrapping_add((*parser).m_positionIdx);
+    let positionPtr = (*parser).m_buffer.as_ptr().wrapping_add((*parser).m_positionIdx.unwrap());
     if !(*parser).m_eventPtr.is_null() && (*parser).m_eventPtr >= positionPtr {
         (*(*parser).m_encoding).updatePosition(
             ExpatBufRef::new(
@@ -3034,7 +3034,9 @@ pub unsafe extern "C" fn XML_GetCurrentLineNumber(mut parser: XML_Parser) -> XML
             ),
             &mut (*parser).m_position,
         );
-        (*parser).m_positionIdx = (*parser).m_eventPtr.wrapping_offset_from((*parser).m_buffer.as_ptr()) as usize;
+        (*parser).m_positionIdx = Some(
+            (*parser).m_eventPtr.wrapping_offset_from((*parser).m_buffer.as_ptr()) as usize
+        );
     }
     (*parser).m_position.lineNumber.wrapping_add(1)
 }
@@ -3043,7 +3045,7 @@ pub unsafe extern "C" fn XML_GetCurrentColumnNumber(mut parser: XML_Parser) -> X
     if parser.is_null() {
         return 0;
     }
-    let positionPtr = (*parser).m_buffer.as_ptr().wrapping_add((*parser).m_positionIdx);
+    let positionPtr = (*parser).m_buffer.as_ptr().wrapping_add((*parser).m_positionIdx.unwrap());
     if !(*parser).m_eventPtr.is_null() && (*parser).m_eventPtr >= positionPtr {
         (*(*parser).m_encoding).updatePosition(
             ExpatBufRef::new(
@@ -3052,7 +3054,9 @@ pub unsafe extern "C" fn XML_GetCurrentColumnNumber(mut parser: XML_Parser) -> X
             ),
             &mut (*parser).m_position,
         );
-        (*parser).m_positionIdx = (*parser).m_eventPtr.wrapping_offset_from((*parser).m_buffer.as_ptr()) as usize;
+        (*parser).m_positionIdx = Some(
+            (*parser).m_eventPtr.wrapping_offset_from((*parser).m_buffer.as_ptr()) as usize
+        );
     }
     (*parser).m_position.columnNumber
 }