Author: rjung
Date: Sun Jul 10 15:28:40 2011
New Revision: 1144878
URL: http://svn.apache.org/viewvc?rev=1144878&view=rev
Log:
Forward port of r1055943 to tcnative trunk:
Fix for 49851.
Modified:
tomcat/native/trunk/native/os/win32/registry.c
Modified: tomcat/native/trunk/native/os/win32/registry.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/win32/registry.c?rev=1144878&r1=1144877&r2=1144878&view=diff
==============================================================================
--- tomcat/native/trunk/native/os/win32/registry.c (original)
+++ tomcat/native/trunk/native/os/win32/registry.c Sun Jul 10 15:28:40 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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
