| Index: fpdfsdk/src/formfiller/FFL_ComboBox.cpp | 
| diff --git a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp | 
| index ee6b7bd83a18c9644319eb6eb7a2d660419dab56..9e58c952aa45e5787164ca509ba4b5e2325ec176 100644 | 
| --- a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp | 
| +++ b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp | 
| @@ -364,7 +364,7 @@ void CFFL_ComboBox::OnSetFocus(CPWL_Wnd* pWnd) | 
| CFX_WideString wsText = pEdit->GetText(); | 
| int nCharacters = wsText.GetLength(); | 
| CFX_ByteString bsUTFText = wsText.UTF16LE_Encode(); | 
| -		unsigned short* pBuffer = (unsigned short*)(FX_LPCSTR)bsUTFText; | 
| +		unsigned short* pBuffer = (unsigned short*)bsUTFText.c_str(); | 
| m_pApp->FFI_OnSetFieldInputFocus(m_pWidget->GetFormField(), pBuffer, nCharacters, TRUE); | 
|  | 
| pEdit->SetEditNotify(this); | 
|  |