Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

[[ Bug 8884 ]] removed stack password and passkey, removed field padding... #82

Closed
wants to merge 4 commits into from

Conversation

montegoulding
Copy link
Member

..., fixed trytoconvertutf16tonative so it actually copies the converted string to the exec point

…ing, fixed trytoconvertutf16tonative so it actually copies the converted string to the exec point
@@ -994,12 +994,17 @@ bool MCExecPoint::trytoconvertutf16tonative()
MCExecPoint t_other_ep;
t_other_ep . setsvalue(getsvalue());
t_other_ep . utf16tonative();

// MERG-2013-05-07: [[ Bug 8884 ]] If returning true the function setting back to utf16 instead of to native
MCString t_string = t_other_ep . getsvalue();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't quite correct - getsvalue() is just a 'get', i.e. it doesn't copy the data so it will potentially get clobbered by the next line... I suggest doing:

MCExecPoint t_temp_ep;
t_temp_ep . setsvalue(t_other_ep . getsvalue());
t_temp_ep . nativetoutf16();

Then use t_temp_ep in the next comparison. This way, 't_other_ep' still contains the native version for the return (if roundtrip succeeds).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, it seems to work fine but better safe than sorry.

@montegoulding
Copy link
Member Author

Sorry, changes to the Xcode project files were not necessary for the fixes. Not sure why the merge created a diff there.

@livecodeian
Copy link
Contributor

merged into release-6.1.1 branch

trevordevore pushed a commit to trevordevore/livecode that referenced this pull request Jul 7, 2015
[[ Property Inspector ]] Temporarily remove custom property tab from property inspector
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants