Update per review

Author: Dmitry Tatarinov

src/nav_msg_glo.c

@@ -18,6 +18,11 @@
 #include <libswiftnav/logging.h>
 #include <libswiftnav/bits.h>
 
+#ifdef UNIT_TEST
+#undef log_error
+#define log_error(...)
+#endif
+
 /* Word Ft (accuracy of measurements), refer to GLO ICD, Table 4.4 */
 const float f_t[] = { 1.0f, 2.0f, 2.5f, 4.0f, 5.0f, 7.0f, 10.0f, 12.0f, 14.0f,
                       16.0f, 32.0f, 64.0f, 128.0f, 256.0f, 512.0f, -1.0f };
@@ -131,8 +136,15 @@ s8 error_detection_glo(const nav_msg_glo_t *n)
  */
 static u32 extract_word_glo(const nav_msg_glo_t *n, u16 bit_index, u8 n_bits)
 {
-  assert(n_bits <= 32 && n_bits > 0);
-  assert(bit_index <= GLO_STR_LEN && bit_index > 0);
+  if (bit_index > GLO_STR_LEN || !bit_index) {
+    log_error("Incorrect bit index %d\n", bit_index);
+    return 0;
+  }
+
+  if (n_bits > 32 || !n_bits ) {
+    log_error("Incorrect number of bits to be extracted %d\n", n_bits);
+    return 0;
+  }
 
   /* Extract a word of n_bits length (n_bits <= 32) at position bit_index into
    * the GLO string.*/

tests/check_glo_decoder.c

@@ -10,6 +10,7 @@
  * WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
  */
 //#define DEBUG 1
+#define UNIT_TEST
 
 #include <stdio.h>
 #include <check.h>
@@ -138,6 +139,11 @@ START_TEST(test_extract_glo_word)
   fail_unless(ret == 0x87654321, "9. %x, expected %x", ret, 0x87654321);
   ret = extract_word_glo(&n, 49, 16);
   fail_unless(ret == 0x4321, "10. %x, expected %x", ret, 0x4321);
+
+  fail_unless(extract_word_glo(&n, 0, 1) == 0, "Expected 0");
+  fail_unless(extract_word_glo(&n, 86, 1) == 0, "Expected 0");
+  fail_unless(extract_word_glo(&n, 1, 0) == 0, "Expected 0");
+  fail_unless(extract_word_glo(&n, 1, 33) == 0, "Expected 0");
 }
 END_TEST