From af7f2f2fcf9887668918bdc5f0670bdd4aae8009 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 14 Mar 2013 17:10:24 -0700 Subject: [PATCH] Fix a bug in ZoneCompactor that meant the zonetab offset was wrong. Bug: 8391426 Change-Id: Ia4a8889b5a613aa96bb3fb5d89a921c913ff7626 --- libc/tools/zoneinfo/ZoneCompactor.java | 4 ++-- libc/zoneinfo/tzdata | Bin 552718 -> 552718 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libc/tools/zoneinfo/ZoneCompactor.java b/libc/tools/zoneinfo/ZoneCompactor.java index 8a1a62854..f47afd13e 100644 --- a/libc/tools/zoneinfo/ZoneCompactor.java +++ b/libc/tools/zoneinfo/ZoneCompactor.java @@ -198,6 +198,8 @@ public class ZoneCompactor { // Write the data. f.write(allData.toByteArray()); + int zonetab_offset = (int) f.getFilePointer(); + // Copy the zone.tab. reader = new BufferedReader(new FileReader(zoneTabFile)); while ((s = reader.readLine()) != null) { @@ -208,8 +210,6 @@ public class ZoneCompactor { } reader.close(); - int zonetab_offset = (int) f.getFilePointer(); - // Go back and fix up the offsets in the header. f.seek(index_offset_offset); f.writeInt(index_offset); diff --git a/libc/zoneinfo/tzdata b/libc/zoneinfo/tzdata index 91cf3a6b693f7bc2279a45c0e624aaa4dbf8b8a6..4cd14508e2618766534e52be1f0bbba6fe98f0c6 100644 GIT binary patch delta 39 ucmeCXr`UH-ae^3=N_?Y4s{~`K1XHU7bE^bPs|0JS1Y4^F`&J2#Z+QUsVGDl% delta 39 ucmeCXr`UH-ae^3AK3}6ms{~`K1XHU7bE^bPs|0JS1Y4^F`&J2#Z+QUr{tI~k -- 2.11.0