diff options
| author | Patrik Nyblom <[email protected]> | 2012-08-30 17:03:50 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-08-30 17:03:50 +0200 |
| commit | 87c5ea0577267fd17bcc572ab81bdac030dd8332 (patch) | |
| tree | 5dbd25d14c53a5182d95ea1e533160dd36fea6cb /erts/emulator/drivers/common | |
| parent | 176f95bb862543085ad667459f4c757b285b972f (diff) | |
| parent | 07905276ce951d59b400516f9a4601d376b383b9 (diff) | |
| download | otp-87c5ea0577267fd17bcc572ab81bdac030dd8332.tar.gz otp-87c5ea0577267fd17bcc572ab81bdac030dd8332.tar.bz2 otp-87c5ea0577267fd17bcc572ab81bdac030dd8332.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/drivers/common')
| -rw-r--r-- | erts/emulator/drivers/common/efile_drv.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c index f24098025e..912f5d3d8b 100644 --- a/erts/emulator/drivers/common/efile_drv.c +++ b/erts/emulator/drivers/common/efile_drv.c @@ -206,6 +206,9 @@ dt_private *get_dt_private(int); # define KEY(desc) (&(desc)->key) #endif +#ifndef MAX +# define MAX(x, y) (((x) > (y)) ? (x) : (y)) +#endif #ifdef FILENAMES_16BIT #ifdef USE_VM_PROBES @@ -2848,8 +2851,9 @@ file_output(ErlDrvData e, char* buf, ErlDrvSizeT count) case FILE_READLINK: { - d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + RESBUFSIZE + 1); - + d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + + MAX(RESBUFSIZE, (FILENAME_BYTELEN(name) + + FILENAME_CHARSIZE)) + 1); FILENAME_COPY(d->b, name); #ifdef USE_VM_PROBES dt_s1 = d->b; @@ -2864,7 +2868,9 @@ file_output(ErlDrvData e, char* buf, ErlDrvSizeT count) case FILE_ALTNAME: { - d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + RESBUFSIZE + 1); + d = EF_SAFE_ALLOC(sizeof(struct t_data) - 1 + + MAX(RESBUFSIZE, (FILENAME_BYTELEN(name) + + FILENAME_CHARSIZE)) + 1); FILENAME_COPY(d->b, name); #ifdef USE_VM_PROBES dt_s1 = d->b; |