This is an archive of the discontinued LLVM Phabricator instance.

Added check for malloc return
ClosedPublic

Authored by vhscampos on Nov 4 2016, 5:04 PM.

Download Raw Diff

Details

Reviewers

sfantao
jlpeyton
jcownie
AndreyChurbanov

Commits

rG1fbb48292888: Added check for malloc return.
rOMP286441: Added check for malloc return.
rL286441: Added check for malloc return.

Summary

This malloc() didn't have a check for successfully allocated memory. I created one following other examples.

Diff Detail

Event Timeline

vhscampos updated this revision to Diff 76956.Nov 4 2016, 5:04 PM

vhscampos retitled this revision from to Added check for malloc return.

vhscampos updated this object.

vhscampos added reviewers: jcownie, jlpeyton, sfantao.

vhscampos added a subscriber: openmp-commits.

LGTM

runtime/src/kmp_i18n.c
839	Please add same check here as well.

This revision is now accepted and ready to land.Nov 8 2016, 10:44 AM

Done.

Victor,
Shall I commit the changes on your behalf?

Yes, please.

Closed by commit rL286441: Added check for malloc return. (authored by achurbanov). · Explain WhyNov 10 2016, 1:17 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

runtime/

src/

kmp_i18n.c

4 lines

Diff 76956

runtime/src/kmp_i18n.c

Show First 20 Lines • Show All 818 Lines • ▼ Show 20 Lines	#else // Non-Windows* OS: Linux* OS or OS X*
// not issue warning if strerror_r() returns `int' instead of expected `char *'.		// not issue warning if strerror_r() returns `int' instead of expected `char *'.
message = __kmp_str_format( "%s", err_msg );		message = __kmp_str_format( "%s", err_msg );

#else // OS X, FreeBSD etc.		#else // OS X, FreeBSD etc.

// XSI version of strerror_r.		// XSI version of strerror_r.

int size = 2048;		int size = 2048;
// TODO: Add checking result of malloc().
char * buffer = (char *) KMP_INTERNAL_MALLOC( size );		char * buffer = (char *) KMP_INTERNAL_MALLOC( size );
		if (buffer == NULL) {
		KMP_FATAL(MemoryAllocFailed);
		}
int rc;		int rc;
rc = strerror_r( err, buffer, size );		rc = strerror_r( err, buffer, size );
if ( rc == -1 ) {		if ( rc == -1 ) {
rc = errno; // XSI version sets errno.		rc = errno; // XSI version sets errno.
}; // if		}; // if
while ( rc == ERANGE ) { // ERANGE means the buffer is too small.		while ( rc == ERANGE ) { // ERANGE means the buffer is too small.
KMP_INTERNAL_FREE( buffer );		KMP_INTERNAL_FREE( buffer );
size *= 2;		size *= 2;
buffer = (char *) KMP_INTERNAL_MALLOC( size );		buffer = (char *) KMP_INTERNAL_MALLOC( size );
		AndreyChurbanovUnsubmitted Done Reply Inline Actions Please add same check here as well. AndreyChurbanov: Please add same check here as well.
rc = strerror_r( err, buffer, size );		rc = strerror_r( err, buffer, size );
if ( rc == -1 ) {		if ( rc == -1 ) {
rc = errno; // XSI version sets errno.		rc = errno; // XSI version sets errno.
}; // if		}; // if
}; // while		}; // while
if ( rc == 0 ) {		if ( rc == 0 ) {
message = buffer;		message = buffer;
} else {		} else {
▲ Show 20 Lines • Show All 135 Lines • Show Last 20 Lines