fix: tf_read_uint24 should use BITOR, not BITAND

Cryptkeeper · Cryptkeeper · commit b31c5d878de5 · 2022-04-12T11:31:42.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.21)
 
 project(tinyfseq
-        VERSION 1.0.0
+        VERSION 1.0.1
         DESCRIPTION "A tiny library for decoding FSEQ (.fseq) v2.0+ sequence files"
         HOMEPAGE_URL "https://github.com/Cryptkeeper/libtinyfseq"
         LANGUAGES C)
diff --git a/tinyfseq.c b/tinyfseq.c
@@ -116,7 +116,7 @@ enum tf_err_t tf_read_var_header(const uint8_t *bd, int bs, struct tf_var_header
 
 static uint32_t tf_read_uint24(const uint8_t *bd) {
     // WARNING: this assumes little endian byte order
-    return (uint32_t) (bd[0] & (bd[1] << 8) & (bd[2] << 16));
+    return (uint32_t) (bd[0] | (bd[1] << 8) | (bd[2] << 16));
 }
 
 enum tf_err_t tf_read_channel_range(const uint8_t *bd, int bs, struct tf_channel_range_t *channelRange, uint8_t **ep) {

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ enum tf_err_t tf_read_var_header(const uint8_t *bd, int bs, struct tf_var_header`
`116`	`116`
`117`	`117`	`static uint32_t tf_read_uint24(const uint8_t *bd) {`
`118`	`118`	`// WARNING: this assumes little endian byte order`
`119`		`- return (uint32_t) (bd[0] & (bd[1] << 8) & (bd[2] << 16));`
	`119`	`+ return (uint32_t) (bd[0] \| (bd[1] << 8) \| (bd[2] << 16));`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`enum tf_err_t tf_read_channel_range(const uint8_t bd, int bs, struct tf_channel_range_t channelRange, uint8_t **ep) {`