From 34baf4b3d3258f1058a189e0b226507277f64138 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Thu, 8 Apr 2010 11:26:03 +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 83f3b727c7..a87f674f29 100644 --- a/src/timezone/pgtz.c +++ b/src/timezone/pgtz.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.58.2.2 2010/04/06 20:35:15 mha Exp $ + * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.58.2.3 2010/04/08 11:26:03 mha Exp $ * *------------------------------------------------------------------------- */ @@ -1089,7 +1089,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) { @@ -1106,7 +1106,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.50.1