diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-10-04 03:06:05 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-10-04 03:06:05 +0000 |
| commit | 64cb7b92e82bd77684999d74aa01e954884e6e79 (patch) | |
| tree | 3ecdcc9ae938072bcfdaa7bc53ecbe2f4a0d5ed0 /sys/isofs/cd9660 | |
| parent | 3caed03f1967bf8dce8538bde32da448348f47ba (diff) | |
sync
Diffstat (limited to 'sys/isofs/cd9660')
| -rw-r--r-- | sys/isofs/cd9660/cd9660_rrip.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c index 347671f3246..c4bb7b24cc2 100644 --- a/sys/isofs/cd9660/cd9660_rrip.c +++ b/sys/isofs/cd9660/cd9660_rrip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_rrip.c,v 1.2 1996/02/29 10:12:22 niklas Exp $ */ +/* $OpenBSD: cd9660_rrip.c,v 1.3 1996/10/04 03:05:30 deraadt Exp $ */ /* $NetBSD: cd9660_rrip.c,v 1.12 1996/02/09 21:32:02 christos Exp $ */ /*- @@ -482,9 +482,18 @@ cd9660_rrip_extref(v, ana) ISO_RRIP_ANALYZE *ana; { ISO_RRIP_EXTREF *p = v; - if (isonum_711(p->len_id) != 10 - || bcmp((char *)p + 8,"RRIP_1991A",10) - || isonum_711(p->version) != 1) + + if (isonum_711(p->version) != 1) + return 0; + if (isonum_711(p->len_id) != 9 + && isonum_711(p->len_id) != 10) + return 0; + if (isonum_711(p->len_id) == 9 + && bcmp((char *)p + 8, "IEEE_1282", 9)) + return 0; + if (isonum_711(p->len_id) == 10 + && bcmp((char *)p + 8, "IEEE_P1282", 10) + && bcmp((char *)p + 8, "RRIP_1991A", 10)) return 0; ana->fields &= ~ISO_SUSP_EXTREF; return ISO_SUSP_EXTREF; |