Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'pan/fortify-source-gcc-4.5' into dev

* pan/fortify-source-gcc-4.5:
  Remove strange name field in efile_drv.c as it upsets -D_FORTIFY_SOURCE

OTP-9025
  • Loading branch information...
commit 3b7fd1030711ad56fa45d18dc6e0f1d0beee2399 2 parents ac360e9 + a1a8303
@bufflig bufflig authored
Showing with 2 additions and 3 deletions.
  1. +2 −3 erts/emulator/drivers/common/efile_drv.c
View
5 erts/emulator/drivers/common/efile_drv.c
@@ -385,7 +385,6 @@ struct t_data
ErlDrvBinary *binp;
int size;
int offset;
- char name[1];
} read_file;
struct {
struct t_readdir_buf *first_buf;
@@ -1117,7 +1116,7 @@ static void invoke_read_file(void *data)
Sint64 size;
if (! (d->result_ok =
- efile_openfile(&d->errInfo, d->c.read_file.name,
+ efile_openfile(&d->errInfo, d->b,
EFILE_MODE_READ, &fd, &size))) {
goto done;
}
@@ -3071,7 +3070,7 @@ file_outputv(ErlDrvData e, ErlIOVec *ev) {
d->command = command;
d->reply = !0;
/* Copy name */
- FILENAME_COPY(d->c.read_file.name, filename);
+ FILENAME_COPY(d->b, filename);
d->c.read_file.binp = NULL;
d->invoke = invoke_read_file;
d->free = free_read_file;
Please sign in to comment.
Something went wrong with that request. Please try again.