[[ Bug 17399 ]] Prevent crash when fetching colorDialogColors

livecodeali · livecodeali · commit 18d82a007eca · 2016-04-25T12:52:49.000+01:00
diff --git a/docs/notes/bugfix-17399.md b/docs/notes/bugfix-17399.md
@@ -0,0 +1 @@
+# Prevent crash on fetching colorDialogColors 
diff --git a/engine/src/desktop-ans.cpp b/engine/src/desktop-ans.cpp
@@ -321,7 +321,7 @@ bool MCA_color(MCStringRef p_title, MCColor p_initial, bool as_sheet, bool& r_ch
 // MERG-2013-08-18: Stubs for colorDialogColors. Possibly implement when color dialog moves to Cocoa
 void MCA_getcolordialogcolors(MCColor*& r_list, uindex_t& r_count)
 {
-    
+    r_count = 0;
 }
 
 void MCA_setcolordialogcolors(MCColor* p_list, uindex_t p_count)
diff --git a/engine/src/srvspec.cpp b/engine/src/srvspec.cpp
@@ -783,6 +783,7 @@ void MCA_setcolordialogcolors(MCColor* p_list, uindex_t p_count)
 
 void MCA_getcolordialogcolors(MCColor*& r_colors, uindex_t& r_count)
 {
+    r_count = 0;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Prevent crash on fetching colorDialogColors`
Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ bool MCA_color(MCStringRef p_title, MCColor p_initial, bool as_sheet, bool& r_ch`
`321`	`321`	`// MERG-2013-08-18: Stubs for colorDialogColors. Possibly implement when color dialog moves to Cocoa`
`322`	`322`	`void MCA_getcolordialogcolors(MCColor*& r_list, uindex_t& r_count)`
`323`	`323`	`{`
`324`		`-`
	`324`	`+ r_count = 0;`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`void MCA_setcolordialogcolors(MCColor* p_list, uindex_t p_count)`
Original file line number	Diff line number	Diff line change
`@@ -783,6 +783,7 @@ void MCA_setcolordialogcolors(MCColor* p_list, uindex_t p_count)`
`783`	`783`
`784`	`784`	`void MCA_getcolordialogcolors(MCColor*& r_colors, uindex_t& r_count)`
`785`	`785`	`{`
	`786`	`+ r_count = 0;`
`786`	`787`	`}`
`787`	`788`
`788`	`789`