From 6efb081e10236187ac3877df13977631b7309a9b Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Thu, 8 Apr 2010 11:25:58 +0000 Subject: [PATCH] Proceed to look for the next timezone when matching a localized Windows timezone name where the information in the registry is incomplete, instead of aborting. This fixes cases when the registry information is incomplete for a timezone that is alphabetically before the one that is in use. Per report from Alexander Forschner --- src/timezone/pgtz.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c index 023fd8b9921..c11bb853227 100644 --- a/src/timezone/pgtz.c +++ b/src/timezone/pgtz.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.68 2010/04/06 20:35:11 mha Exp $ + * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.69 2010/04/08 11:25:58 mha Exp $ * *------------------------------------------------------------------------- */ @@ -1094,7 +1094,7 @@ identify_system_timezone(void) (errmsg_internal("could not query value for 'std' to identify Windows timezone \"%s\": %i", keyname, (int) r))); RegCloseKey(key); - break; + continue; /* Proceed to look at the next timezone */ } if (strcmp(tzname, zonename) == 0) { @@ -1111,7 +1111,7 @@ identify_system_timezone(void) (errmsg_internal("could not query value for 'dlt' to identify Windows timezone \"%s\": %i", keyname, (int) r))); RegCloseKey(key); - break; + continue; /* Proceed to look at the next timezone */ } if (strcmp(tzname, zonename) == 0) { -- 2.39.5