You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cm...@apache.org on 2013/06/11 21:56:25 UTC
svn commit: r1491927 -
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/net/unix/DomainSocket.c
Author: cmccabe
Date: Tue Jun 11 19:56:25 2013
New Revision: 1491927
URL: http://svn.apache.org/r1491927
Log:
HADOOP-9635. Fix potential stack overflow in DomainSocket.c (V. Karthik Kumar via cmccabe)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/net/unix/DomainSocket.c
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/net/unix/DomainSocket.c
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/net/unix/DomainSocket.c?rev=1491927&r1=1491926&r2=1491927&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/net/unix/DomainSocket.c (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/net/unix/DomainSocket.c Tue Jun 11 19:56:25 2013
@@ -276,12 +276,13 @@ JNIEnv *env, jclass clazz, jobject jstr,
jthrowable jthr = NULL;
utfLength = (*env)->GetStringUTFLength(env, jstr);
- if (utfLength > sizeof(path)) {
+ if (utfLength > (sizeof(path)-1)) {
jthr = newIOException(env, "path is too long! We expected a path "
- "no longer than %zd UTF-8 bytes.", sizeof(path));
+ "no longer than %zd UTF-8 bytes.", (sizeof(path)-1));
goto done;
}
(*env)->GetStringUTFRegion(env, jstr, 0, utfLength, path);
+ path [ utfLength ] = 0;
jthr = (*env)->ExceptionOccurred(env);
if (jthr) {
(*env)->ExceptionClear(env);
@@ -305,7 +306,7 @@ JNIEnv *env, jclass clazz, jobject jstr,
// be a directory. (If it is a directory, we will fail to create the socket
// later with EISDIR or similar.)
for (check[0] = '/', check[1] = '\0', rest = path, token = "";
- token && rest[0];
+ token && rest && rest[0];
token = strtok_r(rest, "/", &rest)) {
if (strcmp(check, "/") != 0) {
// If the previous directory we checked was '/', we skip appending another