Merge to XFA: Fix botched "CC:" parameter passing in JS_DocmailForm().

fpdfsdk/src/fsdk_mgr.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <algorithm>
 #include <memory>
 
 #include "fpdfsdk/include/fsdk_mgr.h"
@@ skipping 326 matching lines @@
 void CPDFDoc_Environment::JS_docmailForm(void* mailData,
                                          int length,
                                          FPDF_BOOL bUI,
                                          const FX_WCHAR* To,
                                          const FX_WCHAR* Subject,
                                          const FX_WCHAR* CC,
                                          const FX_WCHAR* BCC,
                                          const FX_WCHAR* Msg) {
   if (m_pInfo && m_pInfo->m_pJsPlatform && m_pInfo->m_pJsPlatform->Doc_mail) {
     CFX_ByteString bsTo = CFX_WideString(To).UTF16LE_Encode();
-    CFX_ByteString bsCC = CFX_WideString(Subject).UTF16LE_Encode();
+    CFX_ByteString bsSubject = CFX_WideString(Subject).UTF16LE_Encode();
+    CFX_ByteString bsCC = CFX_WideString(CC).UTF16LE_Encode();
     CFX_ByteString bsBcc = CFX_WideString(BCC).UTF16LE_Encode();
-    CFX_ByteString bsSubject = CFX_WideString(Subject).UTF16LE_Encode();
     CFX_ByteString bsMsg = CFX_WideString(Msg).UTF16LE_Encode();
     FPDF_WIDESTRING pTo = (FPDF_WIDESTRING)bsTo.GetBuffer(bsTo.GetLength());
     FPDF_WIDESTRING pCC = (FPDF_WIDESTRING)bsCC.GetBuffer(bsCC.GetLength());
     FPDF_WIDESTRING pBcc = (FPDF_WIDESTRING)bsBcc.GetBuffer(bsBcc.GetLength());
     FPDF_WIDESTRING pSubject =
         (FPDF_WIDESTRING)bsSubject.GetBuffer(bsSubject.GetLength());
     FPDF_WIDESTRING pMsg = (FPDF_WIDESTRING)bsMsg.GetBuffer(bsMsg.GetLength());
     m_pInfo->m_pJsPlatform->Doc_mail(m_pInfo->m_pJsPlatform, mailData, length,
                                      bUI, pTo, pSubject, pCC, pBcc, pMsg);
     bsTo.ReleaseBuffer();
@@ skipping 819 matching lines @@
   CPDFSDK_Annot* pFocusAnnot = m_pSDKDoc->GetFocusAnnot();
   if (!pFocusAnnot)
     return nullptr;
 
   for (CPDFSDK_Annot* pAnnot : m_fxAnnotArray) {
     if (pAnnot == pFocusAnnot)
       return pAnnot;
   }
   return nullptr;
 }