Merge r3823 from trunk for issue 199.

SVN-Revision: 3824

diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
index 813df7a46d7d5731beecdbe11a7999d80bf0525c..f35f0ea80bf380baa38497e88955eadab93cff79 100644 (file)
--- a/libarchive/archive_read_support_format_iso9660.c
+++ b/libarchive/archive_read_support_format_iso9660.c
@@ -302,6 +302,8 @@ struct file_info {
                struct file_info        *first;
                struct file_info        **last;
        } rede_files;
+       /* To check a ininity loop. */
+       struct file_info        *loop_by;
 };
 
 struct heap_queue {
@@ -2696,8 +2698,14 @@ rede_add_entry(struct file_info *file)
        struct file_info *re;
 
        re = file->parent;
-       while (re != NULL && !re->re)
+       while (re != NULL && !re->re) {
+               /* Sanity check to prevent a infinity loop
+                * cause by a currupted iso file. */
+               if (re->loop_by == file)
+                       return (-1);
+               re->loop_by = file;
                re = re->parent;
+       }
        if (re == NULL)
                return (-1);