From ad244b473b793dd9a5fa166117204b792f6f8f2e Mon Sep 17 00:00:00 2001 From: "keonpyo.kong" Date: Mon, 8 Apr 2013 19:29:47 +0900 Subject: [PATCH] Fix prevent and Sting length issue Change-Id: I1d06febbdfb2e6a67b4647933b6e08399022a2ca Signed-off-by: keonpyo.kong Apply code review Change-Id: I10706b51978cb6f5c7614900065f609d6ba3c3ad Signed-off-by: keonpyo.kong --- src/ui/FUi_UiBuilder.cpp | 8 ++++++-- src/ui/FUi_UiBuilderControl.cpp | 14 +++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ui/FUi_UiBuilder.cpp b/src/ui/FUi_UiBuilder.cpp index 4e648ec..3d8ae3c 100644 --- a/src/ui/FUi_UiBuilder.cpp +++ b/src/ui/FUi_UiBuilder.cpp @@ -289,8 +289,12 @@ _UiBuilder::Parse(void) returnValue = xmlHandler.Construct(this); - SysTryReturn(NID_UI, returnValue == true, E_OPERATION_FAILED, E_OPERATION_FAILED, "[E_OPERATION_FAILED] Parse Failed - xmlHandler Construct Failed."); - + if (returnValue == false) + { + delete[] pXmlContents; + return E_OPERATION_FAILED; + } + r = xmlHandler.ParseXml(pXmlBuffer, readCount); if (r != E_SUCCESS) { diff --git a/src/ui/FUi_UiBuilderControl.cpp b/src/ui/FUi_UiBuilderControl.cpp index 8941761..4016079 100644 --- a/src/ui/FUi_UiBuilderControl.cpp +++ b/src/ui/FUi_UiBuilderControl.cpp @@ -362,18 +362,17 @@ _UiBuilderControl::ConvertSpecialChar(Tizen::Base::String& string) const { stringPointer[j] = '\n'; i += 2; - j++; + j ++; } else if (stringPointer[i + 1] == 't') { stringPointer[j] = '\t'; i += 2; - j++; + j ++; } else - { + { stringPointer[j] = '\\'; - j++; i++; } @@ -417,12 +416,9 @@ _UiBuilderControl::ConvertSpecialChar(Tizen::Base::String& string) const j++; } } - if (j != i) - { - for (; j <= i; j++) - stringPointer[j] = '\0'; - } + stringPointer[j] = '\0'; + string.SetLength(j); } -- 2.7.4