Updates after feedback. After typing in message box and pressing enter, program crashes

livecodepanos · livecodepanos · commit 2475bb9efca5 · 2013-10-08T15:08:32.000+01:00
diff --git a/engine/src/dskspec.cpp b/engine/src/dskspec.cpp
@@ -100,16 +100,15 @@ MCSErrorMode MCS_get_errormode(void)
 
 bool MCS_put(MCExecContext& ctxt, MCSPutKind p_kind, MCStringRef p_data)
 {
-	ctxt . GetEP() . setvalueref(p_data);
-
+	//Program crashes : Unhandled exception at 0x00783ad6 in engine-community.exe: 0xC0000005: Access violation reading location 0x00000060.
 	switch(p_kind)
 	{
 	case kMCSPutOutput:
 	case kMCSPutBeforeMessage:
 	case kMCSPutIntoMessage:
-		return MCmb -> set(ctxt . GetEP(), nil, 0) == ES_NORMAL;
+		return MCmb -> set(ctxt, p_data);
 	case kMCSPutAfterMessage:
-		return MCmb -> append(ctxt . GetEP(), nil, 0) == ES_NORMAL;
+		return MCmb -> append(ctxt, p_data);
 
 	default:
 		break;
diff --git a/engine/src/exec-files.cpp b/engine/src/exec-files.cpp
@@ -1605,7 +1605,8 @@ void MCFilesExecReadFromFileOrDriverUntil(MCExecContext& ctxt, bool p_driver, bo
 
 	if (MCStringGetLength(p_sentinel) == 1 && MCStringGetNativeCharAtIndex(p_sentinel, 0) == '\004')
 	{
-		IO_read_to_eof(t_stream, ctxt);
+		MCAutoDataRef t_data;
+		IO_read_to_eof(ctxt, t_stream, &t_data);
 		ctxt . SetTheResultToStaticCString("eof");
 	}
 		
diff --git a/engine/src/mcio.cpp b/engine/src/mcio.cpp
@@ -219,14 +219,14 @@ IO_stat IO_write(const void *ptr, uint4 size, uint4 n, IO_handle stream)
 	return MCS_write(ptr, size, n, stream);
 }
 
-IO_stat IO_read_to_eof(IO_handle stream, MCExecContext& ctxt)
+IO_stat IO_read_to_eof(MCExecContext& ctxt, IO_handle stream, MCDataRef& r_data)
 {
 	uint4 nread;
 	nread = (uint4)MCS_fsize(stream) - (uint4)MCS_tell(stream);
-	char *dptr;
-	/* UNCHECKED */ ctxt.GetEP().reserve(nread, dptr);
-	/* UNCHECKED */ MCS_readall(dptr, nread, stream, nread);
-	ctxt.GetEP().commit(nread);
+	void *t_stream;
+	/* UNCHECKED */ MCMemoryAllocate(nread, t_stream);
+	/* UNCHECKED */ MCS_readall(t_stream, nread, stream, nread);
+	/* UNCHECKED */ MCDataCreateWithBytesAndRelease((byte_t*)t_stream, nread, r_data);
 	return IO_NORMAL;
 }
 
diff --git a/engine/src/mcio.h b/engine/src/mcio.h
@@ -67,7 +67,7 @@ extern real8 IO_cleansockets(real8 ctime);
 extern void IO_freeobject(MCObject *o);
 extern IO_stat IO_read(void *ptr, uint4 byte_size, IO_handle stream);
 extern IO_stat IO_write(const void *ptr, uint4 s, uint4 n, IO_handle stream);
-extern IO_stat IO_read_to_eof(IO_handle stream, MCExecContext& ctxt);
+extern IO_stat IO_read_to_eof(MCExecContext& ctxt, IO_handle stream, MCDataRef& r_data);
 extern IO_stat IO_fgets(char *ptr, uint4 length, IO_handle stream);
 
 extern IO_stat IO_read_real8(real8 *dest, IO_handle stream);

Original file line number	Diff line number	Diff line change
`@@ -1605,7 +1605,8 @@ void MCFilesExecReadFromFileOrDriverUntil(MCExecContext& ctxt, bool p_driver, bo`
`1605`	`1605`
`1606`	`1606`	`if (MCStringGetLength(p_sentinel) == 1 && MCStringGetNativeCharAtIndex(p_sentinel, 0) == '\004')`
`1607`	`1607`	`{`
`1608`		`- IO_read_to_eof(t_stream, ctxt);`
	`1608`	`+ MCAutoDataRef t_data;`
	`1609`	`+ IO_read_to_eof(ctxt, t_stream, &t_data);`
`1609`	`1610`	`ctxt . SetTheResultToStaticCString("eof");`
`1610`	`1611`	`}`
`1611`	`1612`
Original file line number	Diff line number	Diff line change
`@@ -219,14 +219,14 @@ IO_stat IO_write(const void *ptr, uint4 size, uint4 n, IO_handle stream)`
`219`	`219`	`return MCS_write(ptr, size, n, stream);`
`220`	`220`	`}`
`221`	`221`
`222`		`-IO_stat IO_read_to_eof(IO_handle stream, MCExecContext& ctxt)`
	`222`	`+IO_stat IO_read_to_eof(MCExecContext& ctxt, IO_handle stream, MCDataRef& r_data)`
`223`	`223`	`{`
`224`	`224`	`uint4 nread;`
`225`	`225`	`nread = (uint4)MCS_fsize(stream) - (uint4)MCS_tell(stream);`
`226`		`- char *dptr;`
`227`		`- /* UNCHECKED */ ctxt.GetEP().reserve(nread, dptr);`
`228`		`- /* UNCHECKED */ MCS_readall(dptr, nread, stream, nread);`
`229`		`- ctxt.GetEP().commit(nread);`
	`226`	`+ void *t_stream;`
	`227`	`+ /* UNCHECKED */ MCMemoryAllocate(nread, t_stream);`
	`228`	`+ /* UNCHECKED */ MCS_readall(t_stream, nread, stream, nread);`
	`229`	`+ /* UNCHECKED / MCDataCreateWithBytesAndRelease((byte_t)t_stream, nread, r_data);`
`230`	`230`	`return IO_NORMAL;`
`231`	`231`	`}`
`232`	`232`