From b18f6ed10a58054adcf4affc2cadb9f68372f616 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Sun, 23 Aug 2015 23:53:21 +0200
Subject: [PATCH] Fix reading ZIP extra field content from local file header.

Extract extra data from buffer allocated for the local extra field.

This fixes regression after ZIP-64 additions which resulted in crashes while
running the test suite.

Closes https://github.com/wxWidgets/wxWidgets/pull/78
---
 src/common/zipstrm.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index cc7fb0b8de..b5e41a162d 100644
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -1073,7 +1073,7 @@ size_t wxZipEntry::ReadLocal(wxInputStream& stream, wxMBConv& conv)
             if (stream.LastRead() != extraLen + 0u)
                 return 0;
 
-            if (LoadExtraInfo(m_Extra->GetData(), extraLen, true))
+            if (LoadExtraInfo(m_LocalExtra->GetData(), extraLen, true))
             {
                 Release(m_LocalExtra);
                 m_LocalExtra = NULL;