From: Seoyeon Kim Date: Thu, 11 Jul 2019 01:33:14 +0000 (+0900) Subject: [Tizen] Fix Coverity issues X-Git-Tag: accepted/tizen/unified/20190716.111332~13^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F80%2F209780%2F1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git [Tizen] Fix Coverity issues - Null pointer dereferences - In AutofillManagerEcoreWl, some dereference ponters are compared before null check. Change-Id: Id6e64478d933ba988e87e1cd5a6d0483b5ff3a5d Signed-off-by: Seoyeon Kim --- diff --git a/dali/internal/input/tizen-wayland/autofill-manager-impl-ecore-wl.cpp b/dali/internal/input/tizen-wayland/autofill-manager-impl-ecore-wl.cpp index 2483ae1..a00e3e2 100755 --- a/dali/internal/input/tizen-wayland/autofill-manager-impl-ecore-wl.cpp +++ b/dali/internal/input/tizen-wayland/autofill-manager-impl-ecore-wl.cpp @@ -336,27 +336,26 @@ void AutofillManagerEcoreWl::ReceiveAuthInfo( autofill_auth_info_h authInfoHandl serviceName, serviceLogoImagePath, serviceMessage ); // Sets the authentication service information in order to use in other components. - mAuthenticationServiceName = serviceName; - mAuthenticationServiceMessage = serviceMessage; - mAuthenticationServiceImagePath = serviceLogoImagePath; - - // Emits the signal to receive the authentication information. - mAuthReceivedSignal.Emit(); - - if( serviceMessage ) + if( serviceName ) { - free( serviceMessage ); + mAuthenticationServiceName = serviceName; + free( serviceName ); } - if( serviceName ) + if( serviceMessage ) { - free( serviceName ); + mAuthenticationServiceMessage = serviceMessage; + free( serviceMessage ); } if( serviceLogoImagePath ) { + mAuthenticationServiceImagePath = serviceLogoImagePath; free( serviceLogoImagePath ); } + + // Emits the signal to receive the authentication information. + mAuthReceivedSignal.Emit(); } else { @@ -381,33 +380,32 @@ void AutofillManagerEcoreWl::FillGroupItem( autofill_fill_response_item_h itemHa id, value, presentationText ); // Sets the fill response information in order to use in other components. - mFillItemId = id; - mFillItemPresentationText = presentationText; - mFillItemValue = value; - - Dali::AutofillItem item = mAutofillGroup.GetAutofillItem( id ); - Internal::Adaptor::AutofillItem& itemImpl = Internal::Adaptor::GetImplementation( item ); - itemImpl.AddPresentationList( presentationText ); - itemImpl.AddFillValueList( value ); - - // Emits the signal to fill the data in text input field. - mFillReceivedSignal.Emit( item ); - if( id ) { + mFillItemId = id; free( id ); } - if( value ) + if( presentationText ) { - free( value ); + mFillItemPresentationText = presentationText; + free( presentationText ); } - if( presentationText ) + if( value ) { - free( presentationText ); + mFillItemValue = value; + free( value ); } + Dali::AutofillItem item = mAutofillGroup.GetAutofillItem( mFillItemId ); + Internal::Adaptor::AutofillItem& itemImpl = Internal::Adaptor::GetImplementation( item ); + itemImpl.AddPresentationList( mFillItemPresentationText ); + itemImpl.AddFillValueList( mFillItemValue ); + + // Emits the signal to fill the data in text input field. + mFillReceivedSignal.Emit( item ); + } // Implementation to fill out the data when the group count is more than one. @@ -426,29 +424,29 @@ void AutofillManagerEcoreWl::FillMultipleGroupItem( autofill_fill_response_item_ id, value, presentationText ); // Sets the fill response information in order to use in other components. - mFillItemId = id; - mFillItemPresentationText = presentationText; - mFillItemValue = value; - - Dali::AutofillItem item = mAutofillGroup.GetAutofillItem( id ); - Internal::Adaptor::AutofillItem& itemImpl = Internal::Adaptor::GetImplementation( item ); - itemImpl.AddPresentationList( presentationText ); - itemImpl.AddFillValueList( value ); - if( id ) { + mFillItemId = id; free( id ); } - if( value ) + if( presentationText ) { - free( value ); + mFillItemPresentationText = presentationText; + free( presentationText ); } - if( presentationText ) + if( value ) { - free( presentationText ); + mFillItemValue = value; + free( value ); } + + Dali::AutofillItem item = mAutofillGroup.GetAutofillItem( mFillItemId ); + Internal::Adaptor::AutofillItem& itemImpl = Internal::Adaptor::GetImplementation( item ); + itemImpl.AddPresentationList( mFillItemPresentationText ); + itemImpl.AddFillValueList( mFillItemValue ); + } #endif // CAPI_AUTOFILL_SUPPORT