svn commit: r1781100 - in /tomcat/native/trunk/native/src: network.c pool.c

[markt]

Author: markt
Date: Tue Jan 31 15:08:52 2017
New Revision: 1781100

URL: http://svn.apache.org/viewvc?rev=1781100&view=rev
Log:
Partial fix for BZ 55938. Resolve 3 clang-analyzer warnings

Modified:
    tomcat/native/trunk/native/src/network.c
    tomcat/native/trunk/native/src/pool.c

Modified: tomcat/native/trunk/native/src/network.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/network.c?rev=1781100&r1=1781099&r2=1781100&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/network.c (original)
+++ tomcat/native/trunk/native/src/network.c Tue Jan 31 15:08:52 2017
@@ -404,6 +404,7 @@ TCN_IMPLEMENT_CALL(jlong, Socket, accept
     }
     return P2J(a);
 cleanup:
+    TCN_ASSERT(p != 0);
     apr_pool_destroy(p);
     return 0;
 }

Modified: tomcat/native/trunk/native/src/pool.c
URL: 
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/pool.c?rev=1781100&r1=1781099&r2=1781100&view=diff
==============================================================================
--- tomcat/native/trunk/native/src/pool.c (original)
+++ tomcat/native/trunk/native/src/pool.c Tue Jan 31 15:08:52 2017
@@ -203,6 +203,7 @@ TCN_IMPLEMENT_CALL(jint, Pool, dataSet)(
 
     UNREFERENCED(o);
     TCN_ASSERT(pool != 0);
+    TCN_ASSERT(key != 0);
 
     if (apr_pool_userdata_get(&old, J2S(key), p) == APR_SUCCESS) {
         if (old)
@@ -237,6 +238,7 @@ TCN_IMPLEMENT_CALL(jobject, Pool, dataGe
 
     UNREFERENCED(o);
     TCN_ASSERT(pool != 0);
+    TCN_ASSERT(key != 0);
 
     if (apr_pool_userdata_get(&old, J2S(key), p) == APR_SUCCESS) {
         if (old) {



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