[Scummvm-cvs-logs] scummvm master -> 24dbee0f065b7165b6c18d73b9b6c564b181640b

sev- sev at scummvm.org
Fri Nov 27 16:41:44 CET 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
24dbee0f06 FULLPIPE: Check result on realloc()


Commit: 24dbee0f065b7165b6c18d73b9b6c564b181640b
    https://github.com/scummvm/scummvm/commit/24dbee0f065b7165b6c18d73b9b6c564b181640b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-11-27T16:38:06+01:00

Commit Message:
FULLPIPE: Check result on realloc()

Changed paths:
    engines/fullpipe/statics.cpp



diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index de3e1ea..8ee3b14 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -106,9 +106,14 @@ bool StepArray::gotoNextPoint() {
 }
 
 void StepArray::insertPoints(Common::Point **points, int pointsCount) {
-	if (_currPointIndex + pointsCount >= _pointsCount)
+	if (_currPointIndex + pointsCount >= _pointsCount) {
 		_points = (Common::Point **)realloc(_points, sizeof(Common::Point *) * (_currPointIndex + pointsCount));
 
+		if (!_points) {
+			error("Out of memory at StepArray::insertPoints()");
+		}
+	}
+
 	_maxPointIndex = _currPointIndex + pointsCount;
 
 	for (int i = 0; i < pointsCount; i++) {






More information about the Scummvm-git-logs mailing list