Merge pull request #26 from MatrixEditor/fix/cstring-parsing

[FIX] Fix greedy parsing of CStrings
MatrixEditor · Feb 14, 2025 · 4c9bf3f · 4c9bf3f
2 parents f901a47 + b3432e7
commit 4c9bf3f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -10,7 +10,7 @@ cmake.source-dir = "."
 
 [project]
 name = "caterpillar"
-version = "2.4.1"
+version = "2.4.2"
 
 description="Library to pack and unpack structurized binary data."
 authors = [

diff --git a/src/caterpillar/__init__.py b/src/caterpillar/__init__.py
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-__version__ = "2.4.1"
+__version__ = "2.4.2"
 __release__ = None
 __author__ = "MatrixEditor"
 

diff --git a/src/caterpillar/fields/common.py b/src/caterpillar/fields/common.py
@@ -848,6 +848,7 @@ def unpack_single(self, context: _ContextLike) -> Any:
                 if not value or value[0] == self._raw_pad[0]:
                     break
                 data.extend(value)
+            value = bytes(data)
         else:
             length = self.__size__(context)
             value: bytes = context[CTX_STREAM].read(length)

diff --git a/src/ccaterpillar/pyproject.toml b/src/ccaterpillar/pyproject.toml
@@ -18,7 +18,7 @@ CP_ENABLE_NATIVE = "1"
 
 [project]
 name = "caterpillar"
-version = "2.4.1"
+version = "2.4.2"
 
 description="Library to pack and unpack structurized binary data."
 authors = [