Issue 128: Don't initialize a static vtable more than once.

SVN-Revision: 2887

diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c
index f15d10d2721b2a1bda40d0372370dee124801022..53b457765b45f3dcdc31c5b7872e36d57422e19b 100644 (file)
--- a/libarchive/archive_read.c
+++ b/libarchive/archive_read.c
@@ -90,6 +90,7 @@ archive_read_vtable(void)
                av.archive_read_next_header2 = _archive_read_next_header2;
                av.archive_free = _archive_read_free;
                av.archive_close = _archive_read_close;
+               inited = 1;
        }
        return (&av);
 }

diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
index ef3bf55d0a8f468ad934f9fcb6f4864a1db4ae22..72141bc8e6bc1805c21321dbc4022c92fa38773f 100644 (file)
--- a/libarchive/archive_read_disk_posix.c
+++ b/libarchive/archive_read_disk_posix.c
@@ -312,6 +312,7 @@ archive_read_disk_vtable(void)
                av.archive_close = _archive_read_close;
                av.archive_read_data_block = _archive_read_data_block;
                av.archive_read_next_header2 = _archive_read_next_header2;
+               inited = 1;
        }
        return (&av);
 }

diff --git a/libarchive/archive_read_disk_windows.c b/libarchive/archive_read_disk_windows.c
index f8fe52f75379a92891de374d39a2ec7bac5610cc..e7617439d26c45ad942d8f0642e3bcd589d78c8c 100644 (file)
--- a/libarchive/archive_read_disk_windows.c
+++ b/libarchive/archive_read_disk_windows.c
@@ -312,6 +312,7 @@ archive_read_disk_vtable(void)
                av.archive_close = _archive_read_close;
                av.archive_read_data_block = _archive_read_data_block;
                av.archive_read_next_header2 = _archive_read_next_header2;
+               inited = 1;
        }
        return (&av);
 }

diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
index 4a1c9ea68cf1c5e6debb810acf750271d0291f44..6072516a26f2bfd2c1cd3a16a11875401afec51f 100644 (file)
--- a/libarchive/archive_write.c
+++ b/libarchive/archive_write.c
@@ -95,6 +95,7 @@ archive_write_vtable(void)
                av.archive_write_header = _archive_write_header;
                av.archive_write_finish_entry = _archive_write_finish_entry;
                av.archive_write_data = _archive_write_data;
+               inited = 1;
        }
        return (&av);
 }

diff --git a/libarchive/archive_write_disk.c b/libarchive/archive_write_disk.c
index 93b56c039479f80158cd7381405c5576d2d882e5..8b974eab5ddfb7317407c043ab75662b5af7e3aa 100644 (file)
--- a/libarchive/archive_write_disk.c
+++ b/libarchive/archive_write_disk.c
@@ -343,6 +343,7 @@ archive_write_disk_vtable(void)
                    = _archive_write_disk_finish_entry;
                av.archive_write_data = _archive_write_disk_data;
                av.archive_write_data_block = _archive_write_disk_data_block;
+               inited = 1;
        }
        return (&av);
 }