Mercurial > hg > openjdk > jdk8u > jdk
changeset 11134:3ee40ba7525d jdk8u65-b06
8130185: More accessible access switch
Reviewed-by: prr, ahgross, asmotrak
Contributed-by: peter.brunet@oracle.com
author | ptbrunet |
---|---|
date | Tue, 14 Jul 2015 22:51:58 -0500 |
parents | 1416a541440a |
children | 5e222163fc75 |
files | src/windows/native/sun/bridge/jabswitch.cpp |
diffstat | 1 files changed, 26 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/windows/native/sun/bridge/jabswitch.cpp Fri Jul 17 12:04:45 2015 +0100 +++ b/src/windows/native/sun/bridge/jabswitch.cpp Tue Jul 14 22:51:58 2015 -0500 @@ -184,8 +184,8 @@ int modify(bool enable) { errno_t error = 0; - char path[512]; - char tempPath[512]; + char path[_MAX_PATH]; + char tempPath[_MAX_PATH]; // Get the path for %USERPROFILE% char *profilePath; size_t len; @@ -195,11 +195,27 @@ perror("Error"); return error; } - strcpy_s(path, profilePath); - strcat_s(path, "\\.accessibility.properties"); - strcpy_s(tempPath, profilePath); - strcat_s(tempPath, "\\.acce$$ibility.properties"); + const char acc_props1[] = "\\.accessibility.properties"; + const char acc_props2[] = "\\.acce$$ibility.properties"; + // len must be 234 or less (233 characters) + // sizeof(path) is 260 (room for 259 characters) + // sizeof(acc_props1) is 27 (26 characters) + // path will hold 233 path characters plus 26 file characters plus 1 null character) + // if len - 1 > 233 then error + if ( len - 1 > sizeof(path) - sizeof(acc_props1) || + len - 1 > sizeof(tempPath) - sizeof(acc_props2) ) { + printf("The USERPROFILE environment variable is too long.\n"); + printf("It must be no longer than 233 characters.\n"); + return 123; + } + path[0] = 0; + strcat_s(path, _MAX_PATH, profilePath); + strcat_s(path, acc_props1); + tempPath[0] = 0; + strcat_s(tempPath, _MAX_PATH, profilePath); + strcat_s(tempPath, acc_props2); free(profilePath); + profilePath = 0; // Open the original file. If it doesn't exist and this is an enable request then create it. error = fopen_s(&origFile, path, "r"); if (error) { @@ -471,5 +487,9 @@ } else { printf("disabled.\n"); } + // Use exit so test case can sense for error. + if (error != 0) { + exit(error); + } } }