--- Merging r15537 into '.':

U    packages/paszlib/src/gzio.pas

# revisions: 15537
------------------------------------------------------------------------
r15537 | jonas | 2010-07-09 22:11:19 +0200 (Fri, 09 Jul 2010) | 2 lines
Changed paths:
   M /trunk/packages/paszlib/src/gzio.pas

  * fixed getting upper byte of "extra field" (patch by Brett, mantis #16887)

------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@16251 -

packages/paszlib/src/gzio.pas

@@ -451,7 +451,7 @@ begin
 
   if ((flags and EXTRA_FIELD) <> 0) then begin { skip the extra field }
     len := cardinal(get_byte(s));
-    len := len + (cardinal(get_byte(s)) shr 8);
+    len := len + (cardinal(get_byte(s)) shl 8);
     { len is garbage if EOF but the loop below will quit anyway }
     while (len <> 0) and (get_byte(s) <> Z_EOF) do Dec(len);
   end;
@@ -1220,4 +1220,4 @@ begin
   gzerror := s^.msg;
 end;
 
-end.
+end.