@@ -283,20 +283,50 @@ def scan_yaml_bytes(data: bytes, label: str = "<yaml>") -> "StreamReport":
283283# Numpy .npy scanning
284284# --------------------------------------------------------------------------- #
285285
286+ # Reject hostile or corrupt headers before decoding/parsing them. NumPy's
287+ # format uses a small Python-literal dictionary; a 1 MiB ceiling is generous
288+ # for real headers while bounding work on untrusted artifacts.
289+ _MAX_NPY_HEADER_BYTES = 1 << 20
290+
291+
286292def _parse_npy_header (data : bytes ) -> tuple [str , int ]:
287- """Return (dtype_str, data_start_offset). Raises ValueError on bad files."""
288- if not data .startswith (_NPY_MAGIC ):
289- raise ValueError ("missing numpy .npy magic bytes" )
290- major = data [6 ]
293+ """Return (dtype_str, data_start_offset); reject malformed/oversized headers."""
294+ if len (data ) < 8 or not data .startswith (_NPY_MAGIC ):
295+ raise ValueError ("missing or truncated numpy .npy magic/version bytes" )
296+
297+ major , minor = data [6 ], data [7 ]
291298 if major == 1 :
292- header_len = int .from_bytes (data [8 :10 ], "little" )
293- hdr_start , data_start = 10 , 10 + header_len
294- else : # v2+: 4-byte header length field
295- header_len = int .from_bytes (data [8 :12 ], "little" )
296- hdr_start , data_start = 12 , 12 + header_len
299+ length_start , length_size , hdr_start = 8 , 2 , 10
300+ encoding = "latin-1"
301+ elif major in (2 , 3 ):
302+ length_start , length_size , hdr_start = 8 , 4 , 12
303+ encoding = "utf-8" if major == 3 else "latin-1"
304+ else :
305+ raise ValueError (f"unsupported numpy .npy format version { major } .{ minor } " )
306+
307+ if len (data ) < hdr_start :
308+ raise ValueError ("truncated numpy .npy header-length field" )
309+
310+ header_len = int .from_bytes (data [length_start :length_start + length_size ], "little" )
311+ if header_len <= 0 :
312+ raise ValueError ("empty numpy .npy header" )
313+ if header_len > _MAX_NPY_HEADER_BYTES :
314+ raise ValueError (
315+ f"numpy .npy header exceeds { _MAX_NPY_HEADER_BYTES } byte safety limit"
316+ )
317+
318+ data_start = hdr_start + header_len
319+ if data_start > len (data ):
320+ raise ValueError ("truncated numpy .npy header body" )
321+
297322 raw_hdr = data [hdr_start :data_start ]
298- header = ast .literal_eval (raw_hdr .decode ("latin-1" ).strip ().rstrip ("\x00 " ).rstrip ())
299- return header .get ("descr" , "" ), data_start
323+ try :
324+ header = ast .literal_eval (raw_hdr .decode (encoding ).strip ().rstrip ("\x00 " ).rstrip ())
325+ except (UnicodeDecodeError , SyntaxError , ValueError ) as exc :
326+ raise ValueError (f"invalid numpy .npy header: { exc } " ) from exc
327+ if not isinstance (header , dict ) or not isinstance (header .get ("descr" ), str ):
328+ raise ValueError ("numpy .npy header must contain a string 'descr' field" )
329+ return header ["descr" ], data_start
300330
301331
302332def _npy_extract_pickle (data : bytes ):
0 commit comments