[[ Bug 19313 ]] Set fdata paragraphs' parent while saving

livecodeali · livecodeali · commit 9681cf0746c0 · 2017-03-15T13:21:48.000Z
If a field on a cloned card or stack is unopened, its fdata
paragraphs may never be assigned a parent. Set the parent before
saving, so that parent font atts can be accessed and preventing
a crash.
diff --git a/docs/notes/bugfix-19313.md b/docs/notes/bugfix-19313.md
@@ -0,0 +1 @@
+# Fix crash when saving field with fdata
diff --git a/engine/src/button.cpp b/engine/src/button.cpp
@@ -3683,7 +3683,7 @@ IO_stat MCButton::save(IO_handle stream, uint4 p_part, bool p_force_ext, uint32_
 	{
 		do
 		{
-			if ((stat = tptr->save(stream, OT_BDATA, p_part, p_version)) != IO_NORMAL)
+			if ((stat = tptr->save(stream, OT_BDATA, p_part, nil, p_version)) != IO_NORMAL)
 				return stat;
 			tptr = (MCCdata *)tptr->next();
 		}
diff --git a/engine/src/cdata.cpp b/engine/src/cdata.cpp
@@ -164,7 +164,7 @@ IO_stat MCCdata::load(IO_handle stream, MCObject *parent, uint32_t version)
 	return IO_NORMAL;
 }
 
-IO_stat MCCdata::save(IO_handle stream, Object_type type, uint4 p_part, uint32_t p_version)
+IO_stat MCCdata::save(IO_handle stream, Object_type type, uint4 p_part, MCObject *p_parent, uint32_t p_version)
 {
 	IO_stat stat;
 
@@ -191,10 +191,16 @@ IO_stat MCCdata::save(IO_handle stream, Object_type type, uint4 p_part, uint32_t
 		}
 		else
 		{
+            // Ensure field's saved MCCdata paragraphs have a parent
+            if (p_parent != nil)
+                MCAssert(p_parent -> gettype() == CT_FIELD);
+            
 			MCParagraph *tptr = (MCParagraph *)data;
 			if (tptr != NULL)
 				do
 				{
+                    if (p_parent != nil)
+                        tptr -> setparent(static_cast<MCField *>(p_parent));
 					if ((stat = tptr->save(stream, p_part, p_version)) != IO_NORMAL)
 						return stat;
 					tptr = (MCParagraph *)tptr->next();
diff --git a/engine/src/cdata.h b/engine/src/cdata.h
@@ -35,7 +35,7 @@ class MCCdata : public MCDLlist
 	MCCdata(const MCCdata &fref, MCField* p_new_owner);
 	~MCCdata();
 	IO_stat load(IO_handle stream, MCObject *parent, uint32_t version);
-	IO_stat save(IO_handle stream, Object_type type, uint4 p_part, uint32_t p_version);
+	IO_stat save(IO_handle stream, Object_type type, uint4 p_part, MCObject *parent, uint32_t p_version);
 	uint4 getid();
 	void setid(uint4 newid);
 	MCParagraph *getparagraphs();
diff --git a/engine/src/field.cpp b/engine/src/field.cpp
@@ -2634,15 +2634,15 @@ IO_stat MCField::save(IO_handle stream, uint4 p_part, bool p_force_ext, uint32_t
 			MCCdata *tptr;
 			tptr = getcarddata(fdata, 0, False);
 			if (tptr != NULL)
-				if ((stat = tptr -> save(stream, OT_FDATA, 0, p_version)) != IO_NORMAL)
+				if ((stat = tptr -> save(stream, OT_FDATA, 0, this, p_version)) != IO_NORMAL)
 					return stat;
 		}
 		else
 		{
 			MCCdata *tptr = fdata;
 			do
 			{
-				if ((stat = tptr->save(stream, OT_FDATA, p_part, p_version)) != IO_NORMAL)
+				if ((stat = tptr->save(stream, OT_FDATA, p_part, this, p_version)) != IO_NORMAL)
 					return stat;
 				tptr = tptr->next();
 			}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix crash when saving field with fdata`
Original file line number	Diff line number	Diff line change
`@@ -3683,7 +3683,7 @@ IO_stat MCButton::save(IO_handle stream, uint4 p_part, bool p_force_ext, uint32_`
`3683`	`3683`	`{`
`3684`	`3684`	`do`
`3685`	`3685`	`{`
`3686`		`- if ((stat = tptr->save(stream, OT_BDATA, p_part, p_version)) != IO_NORMAL)`
	`3686`	`+ if ((stat = tptr->save(stream, OT_BDATA, p_part, nil, p_version)) != IO_NORMAL)`
`3687`	`3687`	`return stat;`
`3688`	`3688`	`tptr = (MCCdata *)tptr->next();`
`3689`	`3689`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ IO_stat MCCdata::load(IO_handle stream, MCObject *parent, uint32_t version)`
`164`	`164`	`return IO_NORMAL;`
`165`	`165`	`}`
`166`	`166`
`167`		`-IO_stat MCCdata::save(IO_handle stream, Object_type type, uint4 p_part, uint32_t p_version)`
	`167`	`+IO_stat MCCdata::save(IO_handle stream, Object_type type, uint4 p_part, MCObject *p_parent, uint32_t p_version)`
`168`	`168`	`{`
`169`	`169`	`IO_stat stat;`
`170`	`170`
`@@ -191,10 +191,16 @@ IO_stat MCCdata::save(IO_handle stream, Object_type type, uint4 p_part, uint32_t`
`191`	`191`	`}`
`192`	`192`	`else`
`193`	`193`	`{`
	`194`	`+ // Ensure field's saved MCCdata paragraphs have a parent`
	`195`	`+ if (p_parent != nil)`
	`196`	`+ MCAssert(p_parent -> gettype() == CT_FIELD);`
	`197`	`+`
`194`	`198`	`MCParagraph tptr = (MCParagraph )data;`
`195`	`199`	`if (tptr != NULL)`
`196`	`200`	`do`
`197`	`201`	`{`
	`202`	`+ if (p_parent != nil)`
	`203`	`+ tptr -> setparent(static_cast<MCField *>(p_parent));`
`198`	`204`	`if ((stat = tptr->save(stream, p_part, p_version)) != IO_NORMAL)`
`199`	`205`	`return stat;`
`200`	`206`	`tptr = (MCParagraph *)tptr->next();`
Original file line number	Diff line number	Diff line change
`@@ -2634,15 +2634,15 @@ IO_stat MCField::save(IO_handle stream, uint4 p_part, bool p_force_ext, uint32_t`
`2634`	`2634`	`MCCdata *tptr;`
`2635`	`2635`	`tptr = getcarddata(fdata, 0, False);`
`2636`	`2636`	`if (tptr != NULL)`
`2637`		`- if ((stat = tptr -> save(stream, OT_FDATA, 0, p_version)) != IO_NORMAL)`
	`2637`	`+ if ((stat = tptr -> save(stream, OT_FDATA, 0, this, p_version)) != IO_NORMAL)`
`2638`	`2638`	`return stat;`
`2639`	`2639`	`}`
`2640`	`2640`	`else`
`2641`	`2641`	`{`
`2642`	`2642`	`MCCdata *tptr = fdata;`
`2643`	`2643`	`do`
`2644`	`2644`	`{`
`2645`		`- if ((stat = tptr->save(stream, OT_FDATA, p_part, p_version)) != IO_NORMAL)`
	`2645`	`+ if ((stat = tptr->save(stream, OT_FDATA, p_part, this, p_version)) != IO_NORMAL)`
`2646`	`2646`	`return stat;`
`2647`	`2647`	`tptr = tptr->next();`
`2648`	`2648`	`}`