Author: jfclere
Date: Thu Jan 6 17:10:09 2011
New Revision: 1055943
URL: http://svn.apache.org/viewvc?rev=1055943&view=rev
Log:
Fix for 49851.
Modified:
tomcat/native/branches/1.1.x/native/os/win32/registry.c
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/branches/1.1.x/native/os/win32/registry.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/os/win32/registry.c?rev=1055943&r1=1055942&r2=1055943&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/os/win32/registry.c (original)
+++ tomcat/native/branches/1.1.x/native/os/win32/registry.c Thu Jan 6 17:10:09
2011
@@ -767,6 +767,7 @@ TCN_IMPLEMENT_CALL(jint, Registry, delet
rv = EBADF;
goto cleanup;
}
+ TCN_INIT_WSTRING(name);
if (only_if_empty)
rv = SHDeleteEmptyKeyW(TCN_KEYS[root].k, J2W(name));
else
@@ -784,6 +785,7 @@ TCN_IMPLEMENT_CALL(jint, Registry, delet
tcn_nt_registry_t *k = J2P(key, tcn_nt_registry_t *);
UNREFERENCED(o);
+ TCN_INIT_WSTRING(name);
rv = RegDeleteValueW(k->key, J2W(name));
TCN_FREE_WSTRING(name);
return (jint)rv;
Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1055943&r1=1055942&r2=1055943&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Thu Jan 6
17:10:09 2011
@@ -39,6 +39,9 @@
<section name="Changes between 1.1.20 and 1.1.21">
<changelog>
<fix>
+ <bug>49851</bug>: JNI Registry.deleteKey and Registry.deleteValue
corrupt Windows registry. (jfclere)
+ </fix>
+ <fix>
<bug>48253</bug>: adding dynamic locking callbacks for openssl engines.
(jfclere)
</fix>
<update>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
