Commit 354c3fa9 authored by Steve Kinneberg's avatar Steve Kinneberg Committed by Ben Collins

IEEE1394(r1174): Fixed a problem parsing directories with null entries.

parent d3684330
...@@ -1348,6 +1348,12 @@ int csr1212_parse_keyval(struct csr1212_keyval *kv, ...@@ -1348,6 +1348,12 @@ int csr1212_parse_keyval(struct csr1212_keyval *kv,
case CSR1212_KV_TYPE_DIRECTORY: case CSR1212_KV_TYPE_DIRECTORY:
for (i = 0; i < kvi_len; i++) { for (i = 0; i < kvi_len; i++) {
csr1212_quad_t ki = kvi->data[i]; csr1212_quad_t ki = kvi->data[i];
/* Some devices put null entries in their unit
* directories. If we come across such and entry,
* then skip it. */
if (ki == 0x0)
continue;
ret = csr1212_parse_dir_entry(kv, ki, ret = csr1212_parse_dir_entry(kv, ki,
(kv->offset + (kv->offset +
quads_to_bytes(i + 1)), quads_to_bytes(i + 1)),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment