Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 66395 invoked from network); 4 May 2008 15:21:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 May 2008 15:21:09 -0000 Received: (qmail 14889 invoked by uid 500); 4 May 2008 15:21:11 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 14785 invoked by uid 500); 4 May 2008 15:21:11 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 14774 invoked by uid 99); 4 May 2008 15:21:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 May 2008 08:21:11 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 May 2008 15:20:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A06842388970; Sun, 4 May 2008 08:20:46 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r653229 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver.cpp Date: Sun, 04 May 2008 15:20:46 -0000 To: commits@harmony.apache.org From: gshimansky@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080504152046.A06842388970@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gshimansky Date: Sun May 4 08:20:46 2008 New Revision: 653229 URL: http://svn.apache.org/viewvc?rev=653229&view=rev Log: Fixed memory allocation bug introduced in 653183 Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver.cpp Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver.cpp?rev=653229&r1=653228&r2=653229&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier-3363/base/ver.cpp Sun May 4 08:20:46 2008 @@ -207,11 +207,13 @@ const char* cname = class_get_name(method_get_class(method)); const char* mname = method_get_name(method); const char* mdesc = method_get_descriptor(method); + const char *format = "%s.%s%s, pass: %s, instr: %s, reason: %s"; unsigned msg_len = strlen(cname) + strlen(mname) + strlen(mdesc) - + strlen(pass) + strlen(instr) + strlen(context.error_message) + 1; + + strlen(pass) + strlen(instr) + strlen(context.error_message) + + strlen(format); *error_msg = (char*)tc_malloc(msg_len); if(*error_msg != NULL) { - sprintf(*error_msg, "%s.%s%s, pass: %s, instr: %s, reason: %s", + sprintf(*error_msg, format, cname, mname, mdesc, pass, instr, context.error_message); } } @@ -219,10 +221,11 @@ void vf_create_error_message(Class_Handle klass, vf_TypeConstraint* constraint, char** error_msg) { const char* cname = class_get_name(klass); + const char *format = "constraint check failed, class: %s, source: %s, target: %s"; unsigned msg_len = strlen(cname) + + strlen(constraint->source) - + strlen(constraint->target) + 1; + + strlen(constraint->target) + strlen(format); *error_msg = (char*)tc_malloc(msg_len); - sprintf(*error_msg, "constraint check failed, class: %s, source: %s, target: %s", + sprintf(*error_msg, format, cname, constraint->source, constraint->target); }