aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2010-12-20 15:18:36 +0100
committerPatrik Nyblom <[email protected]>2010-12-20 15:18:36 +0100
commitcafd7841c7ebd17ac50d6b428887798b75375a86 (patch)
treeceeb6d243e3b2198e856785deb67bf2e99dcf48b /erts/emulator
parente553c11c69a868489e5737e6d3dd160ee4b80aeb (diff)
parent4a27e3d65e76fb0b9e516b6f48cf344098531843 (diff)
downloadotp-cafd7841c7ebd17ac50d6b428887798b75375a86.tar.gz
otp-cafd7841c7ebd17ac50d6b428887798b75375a86.tar.bz2
otp-cafd7841c7ebd17ac50d6b428887798b75375a86.zip
Merge branch 'pan/r14b01-file-driver-fix' into dev
* pan/r14b01-file-driver-fix: Correct usage of pointer-to-size in unix_efile
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/drivers/unix/unix_efile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/drivers/unix/unix_efile.c b/erts/emulator/drivers/unix/unix_efile.c
index 6297ccb8bc..4b3934657c 100644
--- a/erts/emulator/drivers/unix/unix_efile.c
+++ b/erts/emulator/drivers/unix/unix_efile.c
@@ -620,7 +620,7 @@ efile_readdir(Efile_error* errInfo, /* Where to return error codes. */
if (IS_DOT_OR_DOTDOT(dirp->d_name))
continue;
buffer[0] = '\0';
- strncat(buffer, dirp->d_name, size-1);
+ strncat(buffer, dirp->d_name, (*size)-1);
*size = strlen(dirp->d_name);
return 1;
}