[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1587] trunk/lvzip/c_source

[<lab...@us...>]

Revision: 1587
          http://sourceforge.net/p/opengtoolkit/svn/1587
Author:   labviewer
Date:     2019-08-24 00:36:58 +0000 (Sat, 24 Aug 2019)
Log Message:
-----------
Fix a crash due to alignment issues in certain LabVIEW versions

Modified Paths:
--------------
    trunk/lvzip/c_source/unzip.c
    trunk/lvzip/c_source/unzip.h

Modified: trunk/lvzip/c_source/unzip.c
===================================================================
--- trunk/lvzip/c_source/unzip.c	2019-07-15 21:34:47 UTC (rev 1586)
+++ trunk/lvzip/c_source/unzip.c	2019-08-24 00:36:58 UTC (rev 1587)
@@ -901,7 +901,6 @@
 
     if (err == UNZ_OK)
         err = unzGetCurrentFileInfoField(file, &seek, comment, comment_size, file_info.size_file_comment, 1);
-
     if ((err == UNZ_OK) && (pfile_info != NULL))
         *pfile_info = file_info;
     if ((err == UNZ_OK) && (pfile_info_internal != NULL))

Modified: trunk/lvzip/c_source/unzip.h
===================================================================
--- trunk/lvzip/c_source/unzip.h	2019-07-15 21:34:47 UTC (rev 1586)
+++ trunk/lvzip/c_source/unzip.h	2019-08-24 00:36:58 UTC (rev 1587)
@@ -83,14 +83,13 @@
     uint16_t size_filename;         /* filename length                 2 bytes, 34 */
     uint16_t size_file_extra;       /* extra field length              2 bytes, 36 */
     uint16_t size_file_comment;     /* file comment length             2 bytes, 38 */
-    uint16_t padding1;              /* filler1                         2 bytes, 40 */
+    uint16_t size_file_extra_internal; /*                              2 bytes, 40 */
     uint32_t disk_num_start;        /* disk number start               4 bytes, 44 */
     uint16_t internal_fa;           /* internal file attributes        2 bytes, 46 */
-    uint16_t padding2;              /* filler2                         2 bytes, 48 */
+//  uint16_t padding1;              /* filler1                         2 bytes, 48 */
     uint32_t external_fa;           /* external file attributes        4 bytes, 52 */
-    uint32_t padding3;              /* filler3                         4 bytes, 56 */
+//  uint32_t padding2;              /* filler2                         4 bytes, 56 */
     uint64_t disk_offset;           /* disk offset                     8 bytes, 64 */
-    uint16_t size_file_extra_internal; /*                              2 bytes, 66 */
 } unz_file_info64;
 
 typedef struct unz_file_info_s
@@ -109,7 +108,7 @@
    
     uint16_t disk_num_start;        /* disk number start               2 bytes, 32 */
     uint16_t internal_fa;           /* internal file attributes        2 bytes, 34 */
-    uint16_t padding1;              /* filler1                         2 bytes, 36 */
+//  uint16_t padding1;              /* filler1                         2 bytes, 36 */
     uint32_t external_fa;           /* external file attributes        4 bytes, 40 */
 
     uint64_t disk_offset;           /* disk offset                     8 bytes, 48 */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.