From b4b4952066bfabe6cf881784b09ebbc85134cd79 Mon Sep 17 00:00:00 2001 From: "aaronr%us.ibm.com" Date: Thu, 17 May 2007 16:12:30 +0000 Subject: [PATCH] [XForms] Need to truncate submission string buffer before reuse otherwise has issue on branches. Bug 376371, p=msterlin, r=doronr+aaronr git-svn-id: svn://10.0.0.236/trunk@226575 18797224-902f-48f8-a5cc-f745e15eee43 --- .../extensions/xforms/nsXFormsSubmissionElement.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mozilla/extensions/xforms/nsXFormsSubmissionElement.cpp b/mozilla/extensions/xforms/nsXFormsSubmissionElement.cpp index 2e312775bdf..9144b21acc6 100644 --- a/mozilla/extensions/xforms/nsXFormsSubmissionElement.cpp +++ b/mozilla/extensions/xforms/nsXFormsSubmissionElement.cpp @@ -681,8 +681,7 @@ nsXFormsSubmissionElement::Submit() NS_ENSURE_STATE(mFormat != 0); nsCOMPtr stream; - nsCAutoString contentType; - nsCAutoString uri; + nsCAutoString uri, contentType; GetSubmissionURI(uri); rv = SerializeData(submissionDoc, uri, getter_AddRefs(stream), contentType); @@ -772,6 +771,9 @@ nsXFormsSubmissionElement::GetSubmissionURI(nsACString& aURI) NS_ENSURE_SUCCESS(rv, rv); if (xpRes) { + // Truncate uri so GetStringValue replaces the contents with the + // xpath result rather than appending to it. + uri.Truncate(); rv = xpRes->GetStringValue(uri); NS_ENSURE_SUCCESS(rv, rv); } @@ -794,8 +796,8 @@ nsXFormsSubmissionElement::GetSubmissionURI(nsACString& aURI) if (uri.IsEmpty()) nsXFormsUtils::ReportError(NS_LITERAL_STRING("warnSubmitURI"), mElement, nsIScriptError::warningFlag); - else - CopyUTF16toUTF8(uri, aURI); + + CopyUTF16toUTF8(uri, aURI); return rv; }