From ccaf227e337386e108fe3b5a6c30a34c7edf1d8c Mon Sep 17 00:00:00 2001
From: Ryan May <rmay31@gmail.com>
Date: Tue, 27 Feb 2024 14:51:02 -0700
Subject: [PATCH] BUG: Handle message 18 missing VCP info (Fixes #3413)

At some point the fixed VCP info in message type 18 was converted to a
spare field. This still parses fine when filled with 0's, but apparently
some sites are now sending out some random bytes in this location, which
can break our parser.
---
 src/metpy/io/nexrad.py             |  17 +++++++++++------
 src/metpy/static-data-manifest.txt |   1 +
 staticdata/KJKL_20240227_102059    | Bin 0 -> 3558 bytes
 tests/io/test_nexrad.py            |   6 ++++++
 4 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 staticdata/KJKL_20240227_102059

diff --git a/src/metpy/io/nexrad.py b/src/metpy/io/nexrad.py
index 9efce8f8b21..33ddb6bdbbb 100644
--- a/src/metpy/io/nexrad.py
+++ b/src/metpy/io/nexrad.py
@@ -545,12 +545,17 @@ def _decode_msg18(self, msg_hdr):
                 attr = f'VCPAT{num}'
                 dat = self.rda[attr]
                 vcp_hdr = self.vcp_fmt.unpack_from(dat, 0)
-                off = self.vcp_fmt.size
-                els = []
-                for _ in range(vcp_hdr.num_el_cuts):
-                    els.append(self.vcp_el_fmt.unpack_from(dat, off))
-                    off += self.vcp_el_fmt.size
-                self.rda[attr] = vcp_hdr._replace(els=els)
+                # At some point these got changed to spares, so only try to parse the rest if
+                # it looks like the right data.
+                if vcp_hdr.num == num and 0 < 2 * vcp_hdr.size_hw <= len(dat):
+                    off = self.vcp_fmt.size
+                    els = []
+                    for _ in range(vcp_hdr.num_el_cuts):
+                        els.append(self.vcp_el_fmt.unpack_from(dat, off))
+                        off += self.vcp_el_fmt.size
+                    self.rda[attr] = vcp_hdr._replace(els=els)
+                else:  # Otherwise this is just spare and we should dump
+                    self.rda.pop(attr)
 
     msg31_data_hdr_fmt = NamedStruct([('stid', '4s'), ('time_ms', 'L'),
                                       ('date', 'H'), ('az_num', 'H'),
diff --git a/src/metpy/static-data-manifest.txt b/src/metpy/static-data-manifest.txt
index dafa9ea2bd6..c08f0338959 100644
--- a/src/metpy/static-data-manifest.txt
+++ b/src/metpy/static-data-manifest.txt
@@ -6,6 +6,7 @@ GFS_global.nc feae73f72340ee9e8b04fca92f182638a99316ad7262152809b7ccb9b6691e10
 GFS_test.nc b69ae13179428667f6bc14dada1d5f9af4d3737b2b76a79a6001664e1525df3c
 HI-REGIONAL_4km_3.9_20160616_1715.gini 30896dda51c9f933027d8086f0a86543efce12ea90a52981eccbce2e0ce1529e
 KICX_20170712_1458 94bd4f795832f056f7489a5562acf76de9a9cab1694549562cc3154abb22527c
+KJKL_20240227_102059 9344358cb53f2f9449b5a984d40a7dee8048fe6ecbb7fe219ab2420f8ee18776
 KLTX20050329_100015.gz cad6ad8df707ad63c9ddb7306de869186241dd821517daf21ae0a80f4ce0a58d
 KTLX19990503_235621.gz 7a097251bb7a15dbcdec75812812e41a86c5eb9850f55c3d91d120c2c61e046e
 KTLX20130520_201643_V06.gz 772e01b154a5c966982a6d0aa2fc78bc64f08a9b77165b74dc02d7aa5aa69275
diff --git a/staticdata/KJKL_20240227_102059 b/staticdata/KJKL_20240227_102059
new file mode 100644
index 0000000000000000000000000000000000000000..59dd1cce1fdfe15b6903eb74414689dda0ec356e
GIT binary patch
literal 3558
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

literal 0
HcmV?d00001

diff --git a/tests/io/test_nexrad.py b/tests/io/test_nexrad.py
index 46f0cf98863..2ab1bb02eaf 100644
--- a/tests/io/test_nexrad.py
+++ b/tests/io/test_nexrad.py
@@ -109,6 +109,12 @@ def test_msg15():
     assert f.clutter_filter_map['datetime'] == datetime(2013, 5, 19, 5, 15, 0, 0)
 
 
+def test_msg18_novcps():
+    """Check handling of message type 18 with VCP info now spares does not crash."""
+    f = Level2File(get_test_data('KJKL_20240227_102059', as_file_obj=False))
+    assert 'VCPAT11' not in f.rda
+
+
 def test_single_chunk(caplog):
     """Check that Level2File copes with reading a file containing a single chunk."""
     # Need to override the test level set above