[paragui-cvs] CVS: paragui/src/physfs/archivers zip.c,1.1.1.1.6.4,1.1.1.1.6.5

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/src/physfs/archivers
In directory subversions:/tmp/cvs-serv18761/src/physfs/archivers

Modified Files:
      Tag: devel-1-0
        zip.c 
Log Message:
fixed a potential crash in PG_FileArchive::LoadSurface
updated PhysFS



Index: zip.c
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/archivers/zip.c,v
retrieving revision 1.1.1.1.6.4
retrieving revision 1.1.1.1.6.5
diff -C2 -r1.1.1.1.6.4 -r1.1.1.1.6.5
*** zip.c       17 Jul 2002 14:48:32 -0000      1.1.1.1.6.4
--- zip.c       18 Jul 2002 07:24:14 -0000      1.1.1.1.6.5
***************
*** 352,355 ****
--- 352,358 ----
                  return(0);
  
+             if (!__PHYSFS_platformSeek(in, entry->offset))
+                 return(0);
+ 
              inflateEnd(&finfo->stream);
              memcpy(&finfo->stream, &str, sizeof (z_stream));
***************
*** 1087,1091 ****
      /* if it's a symlink, then we ran into a possible symlink loop. */
      is_sym = ( ((ZIPinfo *)(h->opaque))->entries[pos].symlink != NULL );
!     BAIL_IF_MACRO(is_sym, ERR_TOO_MANY_SYMLINKS, 0);
  
      return(1);
--- 1090,1094 ----
      /* if it's a symlink, then we ran into a possible symlink loop. */
      is_sym = ( ((ZIPinfo *)(h->opaque))->entries[pos].symlink != NULL );
!     BAIL_IF_MACRO(is_sym, ERR_SYMLINK_LOOP, 0);
  
      return(1);
***************
*** 1104,1108 ****
  
      /* if it's a symlink, then we ran into a possible symlink loop. */
!     BAIL_IF_MACRO(entry->symlink != NULL, ERR_TOO_MANY_SYMLINKS, 0);
  
      return(entry->last_mod_time);
--- 1107,1111 ----
  
      /* if it's a symlink, then we ran into a possible symlink loop. */
!     BAIL_IF_MACRO(entry->symlink != NULL, ERR_SYMLINK_LOOP, 0);
  
      return(entry->last_mod_time);
***************
*** 1120,1124 ****
      /* if it's a symlink, then we ran into a possible symlink loop. */
      is_sym = ( ((ZIPinfo *)(h->opaque))->entries[pos].symlink != NULL );
!     BAIL_IF_MACRO(is_sym, ERR_TOO_MANY_SYMLINKS, 0);
  
      dlen = strlen(name);
--- 1123,1127 ----
      /* if it's a symlink, then we ran into a possible symlink loop. */
      is_sym = ( ((ZIPinfo *)(h->opaque))->entries[pos].symlink != NULL );
!     BAIL_IF_MACRO(is_sym, ERR_SYMLINK_LOOP, 0);
  
      dlen = strlen(name);
***************
*** 1148,1152 ****
  
      /* if it's a symlink, then we ran into a possible symlink loop. */
!     BAIL_IF_MACRO(zi->entries[pos].symlink != NULL, ERR_TOO_MANY_SYMLINKS, 0);
  
      in = __PHYSFS_platformOpenRead(zi->archiveName);
--- 1151,1155 ----
  
      /* if it's a symlink, then we ran into a possible symlink loop. */
!     BAIL_IF_MACRO(zi->entries[pos].symlink != NULL, ERR_SYMLINK_LOOP, 0);
  
      in = __PHYSFS_platformOpenRead(zi->archiveName);