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

[[ Bug 14052 ]] Ensure no nil string is returned for the type in queryRe... #1502

Merged
livecodesebastien merged 1 commit into from
Dec 2, 2014
Merged

[[ Bug 14052 ]] Ensure no nil string is returned for the type in queryRe... #1502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/notes/bugfix-14052.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# LiveCode 7 crashes without error in many commands
2 changes: 2 additions & 0 deletions engine/src/dskw32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,8 @@ bool MCS_registry_type_to_string(uint32_t p_type, MCStringRef& r_string)
}
}

// SN-2014-11-18: [[ Bug 14052 ]] Avoid to return a nil string (the result is not checked anyway).
r_string = MCValueRetain(kMCEmptyString);
return false;
}

Expand Down
2 changes: 2 additions & 0 deletions engine/src/exec-files.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,8 @@ void MCFilesEvalQueryRegistryWithType(MCExecContext& ctxt, MCStringRef p_key, MC
{
ctxt.SetTheResultToValue(*t_error);
r_string = MCValueRetain(kMCEmptyString);
// SN-2014-11-18: [[ Bug 14052 ]] Assign the empty string to the type as well.
r_type = MCValueRetain(kMCEmptyString);
}
else
ctxt.SetTheResultToEmpty();
Expand Down