diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/asn1/c_src/asn1_erl_driver.c | 16 | ||||
| -rw-r--r-- | lib/kernel/test/ram_file_SUITE.erl | 37 |
2 files changed, 31 insertions, 22 deletions
diff --git a/lib/asn1/c_src/asn1_erl_driver.c b/lib/asn1/c_src/asn1_erl_driver.c index cd2e63a363..fd284e5800 100644 --- a/lib/asn1/c_src/asn1_erl_driver.c +++ b/lib/asn1/c_src/asn1_erl_driver.c @@ -1,19 +1,19 @@ /* * %CopyrightBegin% - * - * Copyright Ericsson AB 2002-2009. All Rights Reserved. - * + * + * Copyright Ericsson AB 2002-2010. All Rights Reserved. + * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in * compliance with the License. You should have received a copy of the * Erlang Public License along with this software. If not, it can be * retrieved online at http://www.erlang.org/. - * + * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See * the License for the specific language governing rights and limitations * under the License. - * + * * %CopyrightEnd% * */ @@ -206,7 +206,11 @@ int asn1_drv_control(ErlDrvData handle, set_port_control_flags(a_data->port, PORT_CONTROL_FLAG_BINARY); if (command == ASN1_COMPLETE) - { /* Do the PER complete encode step */ + { + if (buf_len==0) { + return 0; /* Avoid binary buffer overwrite (OTP-8451) */ + } + /* Do the PER complete encode step */ if ((drv_binary = driver_alloc_binary(buf_len))==NULL) { /* error handling */ set_port_control_flags(a_data->port, 0); diff --git a/lib/kernel/test/ram_file_SUITE.erl b/lib/kernel/test/ram_file_SUITE.erl index 55c9497670..798a37d3dc 100644 --- a/lib/kernel/test/ram_file_SUITE.erl +++ b/lib/kernel/test/ram_file_SUITE.erl @@ -1,19 +1,19 @@ %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 2001-2009. All Rights Reserved. -%% +%% +%% Copyright Ericsson AB 2001-2010. All Rights Reserved. +%% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in %% compliance with the License. You should have received a copy of the %% Erlang Public License along with this software. If not, it can be %% retrieved online at http://www.erlang.org/. -%% +%% %% Software distributed under the License is distributed on an "AS IS" %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See %% the License for the specific language governing rights and limitations %% under the License. -%% +%% %% %CopyrightEnd% %% @@ -472,20 +472,25 @@ uuencode(Config) when is_list(Config) -> %% %% Uuencode and decode test %% - ?line {ok, 0} = ?FILE_MODULE:position(FdReal, bof), - ?line {ok, 0} = ?FILE_MODULE:position(Fd, bof), - ?line ok = ?FILE_MODULE:truncate(Fd), - ?line {ok, Sz} = ?FILE_MODULE:copy(FdReal, Fd), - ?line {ok, SzUu} = ?RAM_FILE_MODULE:uuencode(Fd), - ?line true = (Sz =< SzUu), - ?line {ok, Sz } = ?RAM_FILE_MODULE:uudecode(Fd), - ?line {ok, 0} = ?FILE_MODULE:position(FdReal, bof), - ?line {ok, 0} = ?FILE_MODULE:position(Fd, bof), - ?line true = compare(FdReal, Fd), - %% + F = fun(Offs) -> + Size = Sz - Offs, + ?line {ok, Offs} = ?FILE_MODULE:position(FdReal, {bof,Offs}), + ?line {ok, 0} = ?FILE_MODULE:position(Fd, bof), + ?line ok = ?FILE_MODULE:truncate(Fd), + ?line {ok, Size} = ?FILE_MODULE:copy(FdReal, Fd), + ?line {ok, SizeUu} = ?RAM_FILE_MODULE:uuencode(Fd), + ?line true = (Size =< SizeUu), + ?line {ok, Size} = ?RAM_FILE_MODULE:uudecode(Fd), + ?line {ok, Offs} = ?FILE_MODULE:position(FdReal, {bof,Offs}), + ?line {ok, 0} = ?FILE_MODULE:position(Fd, bof), + ?line true = compare(FdReal, Fd) + end, + lists:foreach(F, lists:seq(0,Sz-1, 43)), + ?line ok = ?FILE_MODULE:close(FdReal), ?line ok = ?FILE_MODULE:close(Fd), ?line ok = ?FILE_MODULE:close(FdRealUu), + %% ok. |