diff options
author | Micael Karlberg <[email protected]> | 2013-04-16 15:45:16 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2013-04-16 15:45:16 +0200 |
commit | 579b659afdc9dd5a2178c5c756964ba3b56dbded (patch) | |
tree | ff8234ef6824f2a4fa0884d9b40de8b30478ef56 /lib/megaco/src/flex/megaco_flex_scanner_handler.erl | |
parent | c9a6ea38eb2a2a3c3d91e3905ce561fd001320be (diff) | |
parent | 592f8635f6496fcd082828a1c7769df5c21fae33 (diff) | |
download | otp-579b659afdc9dd5a2178c5c756964ba3b56dbded.tar.gz otp-579b659afdc9dd5a2178c5c756964ba3b56dbded.tar.bz2 otp-579b659afdc9dd5a2178c5c756964ba3b56dbded.zip |
Merge branch 'bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r13' into bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r14
Conflicts:
lib/megaco/doc/src/notes.xml
lib/megaco/src/app/megaco.appup.src
lib/megaco/test/megaco_codec_flex_lib.erl
lib/megaco/test/megaco_codec_v2_test.erl
lib/megaco/test/megaco_test_lib.erl
lib/megaco/vsn.mk
Diffstat (limited to 'lib/megaco/src/flex/megaco_flex_scanner_handler.erl')
-rw-r--r-- | lib/megaco/src/flex/megaco_flex_scanner_handler.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/megaco/src/flex/megaco_flex_scanner_handler.erl b/lib/megaco/src/flex/megaco_flex_scanner_handler.erl index 420202134e..28333ab1d0 100644 --- a/lib/megaco/src/flex/megaco_flex_scanner_handler.erl +++ b/lib/megaco/src/flex/megaco_flex_scanner_handler.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2001-2010. All Rights Reserved. +%% Copyright Ericsson AB 2001-2013. 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 @@ -181,11 +181,11 @@ terminate(_Reason, _S) -> %% Returns: {ok, NewState} %%---------------------------------------------------------------------- -code_change({down, _Vsn}, #state{conf = Conf} = State, downgrade_to_pre_3_13_1) -> +code_change({down, _Vsn}, #state{conf = Conf} = State, downgrade_to_pre_3_14_3) -> NewPorts = bump_flex_scanner(Conf), {ok, State#state{conf = {flex, NewPorts}}}; -code_change(_Vsn, #state{conf = Conf} = State, upgrade_from_pre_3_13_1) -> +code_change(_Vsn, #state{conf = Conf} = State, upgrade_from_pre_3_14_2) -> NewPorts = bump_flex_scanner(Conf), {ok, State#state{conf = {flex, NewPorts}}}; |