tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject svn commit: r1056218 - in /tomcat/native/branches/1.1.x: native/src/proc.c xdocs/miscellaneous/changelog.xml
Date Fri, 07 Jan 2011 08:28:05 GMT
Author: jfclere
Date: Fri Jan  7 08:28:05 2011
New Revision: 1056218

URL: http://svn.apache.org/viewvc?rev=1056218&view=rev
Log:
Fix for 49557.

Modified:
    tomcat/native/branches/1.1.x/native/src/proc.c
    tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml

Modified: tomcat/native/branches/1.1.x/native/src/proc.c
URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/proc.c?rev=1056218&r1=1056217&r2=1056218&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/proc.c (original)
+++ tomcat/native/branches/1.1.x/native/src/proc.c Fri Jan  7 08:28:05 2011
@@ -211,7 +211,7 @@ TCN_IMPLEMENT_CALL(jint, Proc, create)(T
     if (args)
         as = (*e)->GetArrayLength(e, args);
     if (env)
-        es = (*e)->GetArrayLength(e, args);
+        es = (*e)->GetArrayLength(e, env);
     if (as > (MAX_ARGS_SIZE - 1) || es > (MAX_ENV_SIZE - 2)) {
         TCN_FREE_CSTRING(progname);
         return APR_EINVAL;
@@ -228,7 +228,7 @@ TCN_IMPLEMENT_CALL(jint, Proc, create)(T
     if (es) {
         for (i = 0; i < es; i++) {
             jstring str = (*e)->GetObjectArrayElement(e, env, i);
-            s_env[i+1] = tcn_get_string(e, str);
+            s_env[i] = tcn_get_string(e, str);
             (*e)->DeleteLocalRef(e, str);
         }
 #ifdef WIN32

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=1056218&r1=1056217&r2=1056218&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Fri Jan  7 08:28:05 2011
@@ -39,6 +39,9 @@
 <section name="Changes between 1.1.20 and 1.1.21">
   <changelog>
     <fix>
+      <bug>49557</bug>: index erro in the loop to get the env info in the proc.create
function. (kkolinko, jfclere)
+    </fix>
+    <fix>
       <bug>49851</bug>: JNI Registry.deleteKey and Registry.deleteValue corrupt
Windows registry. (jfclere)
     </fix>
     <fix>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message