sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

BGE: correct ftell use in LoadGlobalDict

Browse Source
This commit is contained in:
Jorge Bernal 2015-06-05 11:14:09 +10:00 committed by Campbell Barton
parent f3434e5f82
commit b2e5c017a1
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/gameengine/Ketsji/KX_GameActuator.cpp
View File

@ -178,6 +178,11 @@ bool KX_GameActuator::Update()
// obtain file size: // obtain file size:
fseek (fp , 0 , SEEK_END); fseek (fp , 0 , SEEK_END);
marshal_length = ftell(fp); marshal_length = ftell(fp);
if (marshal_length == -1) {
printf("warning: could not read position of '%s'\n", mashal_path);
fclose(fp);
break;
}
rewind(fp); rewind(fp);
marshal_buffer = (char*) malloc (sizeof(char)*marshal_length); marshal_buffer = (char*) malloc (sizeof(char)*marshal_length);

9
source/gameengine/Ketsji/KX_PythonInit.cpp
View File

@ -356,7 +356,7 @@ static PyObject *gPyLoadGlobalDict(PyObject *)
{ {
char marshal_path[512]; char marshal_path[512];
char *marshal_buffer = NULL; char *marshal_buffer = NULL;
size_t marshal_length; int marshal_length;
FILE *fp = NULL; FILE *fp = NULL;
int result; int result;
@ -367,7 +367,12 @@ static PyObject *gPyLoadGlobalDict(PyObject *)
if (fp) { if (fp) {
// obtain file size: // obtain file size:
fseek (fp, 0, SEEK_END); fseek (fp, 0, SEEK_END);
marshal_length = (size_t)ftell(fp); marshal_length = ftell(fp);
if (marshal_length == -1) {
printf("Warning: could not read position of '%s'\n", marshal_path);
fclose(fp);
Py_RETURN_NONE;
}
rewind(fp); rewind(fp);
marshal_buffer = (char*)malloc (sizeof(char)*marshal_length); marshal_buffer = (char*)malloc (sizeof(char)*marshal_length);