archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8204539: improve error messages in matchJavaTZ [windows]

Browse source 
Reviewed-by: coffeys, clanger, goetz
This commit is contained in:
Matthias Baesken 2018-06-08 13:06:08 +02:00
parent bb1c912d9e
commit 48966d03e8
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/java.base/windows/native/libjava/TimeZone_md.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -437,6 +437,8 @@ static char *matchJavaTZ(const char *java_home_dir, int value_type, char *tzName
char *mapFileName;
char lineBuffer[MAX_ZONE_CHAR * 4];
int noMapID = *mapID == '\0'; /* no mapID on Vista and later */
int offset = 0;
const char* errorMessage = "unknown error";
mapFileName = malloc(strlen(java_home_dir) + strlen(MAPPINGS_FILE) + 1);
if (mapFileName == NULL) {
@ -472,10 +474,14 @@ static char *matchJavaTZ(const char *java_home_dir, int value_type, char *tzName
items[itemIndex] = start;
while (*idx && *idx != ':') {
if (++idx >= endp) {
errorMessage = "premature end of line";
offset = (int)(idx - lineBuffer);
goto illegal_format;
}
}
if (*idx == '\0') {
errorMessage = "illegal null character found";
offset = (int)(idx - lineBuffer);
goto illegal_format;
}
*idx++ = '\0';
@ -483,6 +489,8 @@ static char *matchJavaTZ(const char *java_home_dir, int value_type, char *tzName
}
if (*idx != '\n') {
errorMessage = "illegal non-newline character found";
offset = (int)(idx - lineBuffer);
goto illegal_format;
}
@ -516,7 +524,8 @@ static char *matchJavaTZ(const char *java_home_dir, int value_type, char *tzName
illegal_format:
(void) fclose(fp);
jio_fprintf(stderr, "tzmappings: Illegal format at line %d.\n", line);
jio_fprintf(stderr, "Illegal format in tzmappings file: %s at line %d, offset %d.\n",
errorMessage, line, offset);
return NULL;
}