Return-Path: Delivered-To: apmail-ws-axis-cvs-archive@www.apache.org Received: (qmail 4947 invoked from network); 4 Oct 2004 15:28:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 4 Oct 2004 15:28:55 -0000 Received: (qmail 62820 invoked by uid 500); 4 Oct 2004 15:28:54 -0000 Delivered-To: apmail-ws-axis-cvs-archive@ws.apache.org Received: (qmail 62587 invoked by uid 500); 4 Oct 2004 15:28:52 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 62572 invoked by uid 99); 4 Oct 2004 15:28:51 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 04 Oct 2004 08:28:51 -0700 Received: (qmail 4895 invoked by uid 1498); 4 Oct 2004 15:28:50 -0000 Date: 4 Oct 2004 15:28:50 -0000 Message-ID: <20041004152850.4894.qmail@minotaur.apache.org> From: whitlock@apache.org To: ws-axis-cvs@apache.org Subject: cvs commit: ws-axis/c/tools/trace/org/apache/axis/tracetool Tracer.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N whitlock 2004/10/04 08:28:50 Modified: c/tools/trace/org/apache/axis/tracetool Tracer.java Log: Add try/catch around trace entry/exit to guard against bad data being passed into trace Revision Changes Path 1.3 +7 -3 ws-axis/c/tools/trace/org/apache/axis/tracetool/Tracer.java Index: Tracer.java =================================================================== RCS file: /home/cvs/ws-axis/c/tools/trace/org/apache/axis/tracetool/Tracer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Tracer.java 27 Sep 2004 15:33:46 -0000 1.2 +++ Tracer.java 4 Oct 2004 15:28:50 -0000 1.3 @@ -85,7 +85,7 @@ String line = "\n" + " #ifdef ENABLE_AXISTRACE\n" - + " if (g_pAT) {\n" + + " if (g_pAT) try {\n" + " char traceLine[256];\n" + " sprintf(traceLine,\"> "; if (null != signature.getClassName()) @@ -113,7 +113,9 @@ line += ");\n"; line += " AXISTRACE1(traceLine,INFO);" + SIGNATURE + "\n"; - line += " }\n"; + line += " } catch (...) {\n"; + line += " AXISTRACE1(\"Unknown exception caught during trace entry\",INFO);\n"; + line += " }\n"; line += " #endif\n"; write(line); flush(); @@ -190,7 +192,7 @@ + " traceRet = (" + value + ");\n"; - line += " if (g_pAT) {\n"; + line += " if (g_pAT) try {\n"; line += " char traceLine[256];\n"; line += " sprintf(traceLine,\"< " + methodName @@ -200,6 +202,8 @@ + retValue + ");\n"; line += " AXISTRACE1(traceLine,INFO);" + SIGNATURE + "\n"; + line += " } catch (...) {\n"; + line += " AXISTRACE1(\"Unknown exception caught during trace exit\",INFO);\n"; line += " }\n"; line += " return traceRet;\n"; line += " #else\n";