Browse Source

Check access to file contents before adding it to public iso tree.

release-1.5.4.branch
Vreixo Formoso 15 years ago
parent
commit
71cd3ccb89
  1. 6
      src/stream.c
  2. 4
      src/tree.c

6
src/stream.c

@ -159,6 +159,12 @@ int iso_file_source_stream_new(IsoFileSource *src, IsoStream **stream)
if (S_ISDIR(info.st_mode)) {
return ISO_FILE_IS_DIR;
}
/* check for read access to contents */
r = iso_file_source_access(src);
if (r < 0) {
return r;
}
str = malloc(sizeof(IsoStream));
if (str == NULL) {

4
src/tree.c

@ -462,8 +462,8 @@ int iso_add_dir_aux(IsoImage *image, IsoDir *parent, IsoFileSource *dir)
result = builder->create_node(builder, image, file, &new);
if (result < 0) {
iso_msg_debug(image, "Error %d when adding file %s", result,
iso_file_source_get_path(file));
iso_msg_note(image, LIBISO_FILE_IGNORED, "Error %d when adding "
"file %s", result, iso_file_source_get_path(file));
if (image->recOpts->report) {
action = image->recOpts->report(file, result, flag);

Loading…
Cancel
Save