Bug fix: iso_read_opts_set_no_rockridge() did not prevent reading of root SUSP

This commit is contained in:
Thomas Schmitt 2016-11-13 09:52:25 +01:00
parent 8bf32d8d14
commit c51efce8d1

View File

@ -3017,15 +3017,14 @@ int iso_image_filesystem_new(IsoDataSource *src, struct iso_read_opts *opts,
} while (buffer[0] != 255); } while (buffer[0] != 255);
/* 4. check if RR extensions are being used */ /* 4. check if RR extensions are being used */
if (opts->norock) {
/* user doesn't want to read RR extensions */
data->rr = RR_EXT_NO;
} else {
ret = read_root_susp_entries(data, data->pvd_root_block); ret = read_root_susp_entries(data, data->pvd_root_block);
if (ret < 0) { if (ret < 0) {
goto fs_cleanup; goto fs_cleanup;
} }
/* user doesn't want to read RR extensions */
if (opts->norock) {
data->rr = RR_EXT_NO;
} else {
data->rr = data->rr_version; data->rr = data->rr_version;
} }