diff options
| author | Henrik Nord <[email protected]> | 2015-08-20 10:16:12 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-08-20 10:16:12 +0200 |
| commit | 25be5551705cf64f2ecc7be5f6c64c9c908e2938 (patch) | |
| tree | b7de5288a61f639972cba56e4868694eba917375 /erts/emulator/drivers | |
| parent | 92f855b86e0c5c68d98465f8dc6ba6bc90618154 (diff) | |
| parent | e3a5ad489d6e6cc190b609f8648b6af993c1b333 (diff) | |
| download | otp-25be5551705cf64f2ecc7be5f6c64c9c908e2938.tar.gz otp-25be5551705cf64f2ecc7be5f6c64c9c908e2938.tar.bz2 otp-25be5551705cf64f2ecc7be5f6c64c9c908e2938.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
erts/vsn.mk
Diffstat (limited to 'erts/emulator/drivers')
| -rw-r--r-- | erts/emulator/drivers/unix/ttsl_drv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/drivers/unix/ttsl_drv.c b/erts/emulator/drivers/unix/ttsl_drv.c index 0f773b69fb..53146e71f0 100644 --- a/erts/emulator/drivers/unix/ttsl_drv.c +++ b/erts/emulator/drivers/unix/ttsl_drv.c @@ -720,6 +720,7 @@ static void ttysl_from_erlang(ErlDrvData ttysl_data, char* buf, ErlDrvSizeT coun } driver_enq_bin(ttysl_port,putcbuf,0,putcpos); + driver_free_binary(putcbuf); if (sz == 0) { for (;;) { @@ -1207,6 +1208,7 @@ static int outc(int c) putcbuf->orig_bytes[putcpos++] = c; if (putcpos == putclen) { driver_enq_bin(ttysl_port,putcbuf,0,putclen); + driver_free_binary(putcbuf); putcpos = 0; putclen = TTY_BUFFSIZE; putcbuf = driver_alloc_binary(BUFSIZ); |