archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

use safer functions, check error value

Browse source
This commit is contained in:
Stanislav Malyshev 2007-02-17 01:45:52 +00:00
parent 704b191d6a
commit 05584eb55a
1 changed files with 30 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

51
ext/pspell/pspell.c
View file

@ -186,16 +186,19 @@ static PHP_FUNCTION(pspell_new)
* pointing to the location of the dictionaries * pointing to the location of the dictionaries
*/ */
if(0 == RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Aspell", &hkey)) { if(0 == RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Aspell", &hkey)) {
LONG result;
dwLen = sizeof(aspell_dir) - 1; dwLen = sizeof(aspell_dir) - 1;
RegQueryValueEx(hkey, "", NULL, &dwType, (LPBYTE)&aspell_dir, &dwLen); result = RegQueryValueEx(hkey, "", NULL, &dwType, (LPBYTE)&aspell_dir, &dwLen);
RegCloseKey(hkey); RegCloseKey(hkey);
strcpy(data_dir, aspell_dir); if(result == ERROR_SUCCESS) {
strcat(data_dir, "\\data"); strlcpy(data_dir, aspell_dir, sizeof(data_dir));
strcpy(dict_dir, aspell_dir); strlcat(data_dir, "\\data", sizeof(data_dir));
strcat(dict_dir, "\\dict"); strlcpy(dict_dir, aspell_dir, sizeof(dict_dir));
strlcat(dict_dir, "\\dict", sizeof(dict_dir));
pspell_config_replace(config, "data-dir", data_dir); pspell_config_replace(config, "data-dir", data_dir);
pspell_config_replace(config, "dict-dir", dict_dir); pspell_config_replace(config, "dict-dir", dict_dir);
}
} }
#endif #endif
@ -291,16 +294,19 @@ static PHP_FUNCTION(pspell_new_personal)
* pointing to the location of the dictionaries * pointing to the location of the dictionaries
*/ */
if(0 == RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Aspell", &hkey)) { if(0 == RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Aspell", &hkey)) {
LONG result;
dwLen = sizeof(aspell_dir) - 1; dwLen = sizeof(aspell_dir) - 1;
RegQueryValueEx(hkey, "", NULL, &dwType, (LPBYTE)&aspell_dir, &dwLen); result = RegQueryValueEx(hkey, "", NULL, &dwType, (LPBYTE)&aspell_dir, &dwLen);
RegCloseKey(hkey); RegCloseKey(hkey);
strcpy(data_dir, aspell_dir); if(result == ERROR_SUCCESS) {
strcat(data_dir, "\\data"); strlcpy(data_dir, aspell_dir, sizeof(data_dir));
strcpy(dict_dir, aspell_dir); strlcat(data_dir, "\\data", sizeof(data_dir));
strcat(dict_dir, "\\dict"); strlcpy(dict_dir, aspell_dir, sizeof(dict_dir));
strlcat(dict_dir, "\\dict", sizeof(dict_dir));
pspell_config_replace(config, "data-dir", data_dir); pspell_config_replace(config, "data-dir", data_dir);
pspell_config_replace(config, "dict-dir", dict_dir); pspell_config_replace(config, "dict-dir", dict_dir);
}
} }
#endif #endif
@ -649,16 +655,19 @@ static PHP_FUNCTION(pspell_config_create)
* pointing to the location of the dictionaries * pointing to the location of the dictionaries
*/ */
if(0 == RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Aspell", &hkey)) { if(0 == RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Aspell", &hkey)) {
LONG result;
dwLen = sizeof(aspell_dir) - 1; dwLen = sizeof(aspell_dir) - 1;
RegQueryValueEx(hkey, "", NULL, &dwType, (LPBYTE)&aspell_dir, &dwLen); result = RegQueryValueEx(hkey, "", NULL, &dwType, (LPBYTE)&aspell_dir, &dwLen);
RegCloseKey(hkey); RegCloseKey(hkey);
strcpy(data_dir, aspell_dir); if(result == ERROR_SUCCESS) {
strcat(data_dir, "\\data"); strlcpy(data_dir, aspell_dir, sizeof(data_dir));
strcpy(dict_dir, aspell_dir); strlcat(data_dir, "\\data", sizeof(data_dir));
strcat(dict_dir, "\\dict"); strlcpy(dict_dir, aspell_dir, sizeof(dict_dir));
strlcat(dict_dir, "\\dict", sizeof(dict_dir));
pspell_config_replace(config, "data-dir", data_dir); pspell_config_replace(config, "data-dir", data_dir);
pspell_config_replace(config, "dict-dir", dict_dir); pspell_config_replace(config, "dict-dir", dict_dir);
}
} }
#endif #endif