diff options
| author | Sverker Eriksson <[email protected]> | 2014-01-27 19:30:32 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-01-27 19:31:24 +0100 |
| commit | bece9227ecffb5f164a383a826f63835bd32175a (patch) | |
| tree | 9dc5c751d0d69254aee69c58696c2c314c70069e /erts/emulator/beam/erl_db_util.c | |
| parent | a6ffce4547a3a2c4cb1409a0a679a64b9afdfe9f (diff) | |
| parent | 29196a3528e034d3d46ec4589749074f8d766b97 (diff) | |
| download | otp-bece9227ecffb5f164a383a826f63835bd32175a.tar.gz otp-bece9227ecffb5f164a383a826f63835bd32175a.tar.bz2 otp-bece9227ecffb5f164a383a826f63835bd32175a.zip | |
Merge branch 'sverk/misc-bug-fixes'
OTP-11618
* sverk/misc-bug-fixes:
erts: Fix faulty assert in match spec engine.
erts: Fix crash when comparing very large floats with integers
erts: Refactor big-float compare on HALFWORD to use C-stack
erts: Fix halfword compile errors in ESTACK
Diffstat (limited to 'erts/emulator/beam/erl_db_util.c')
| -rw-r--r-- | erts/emulator/beam/erl_db_util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c index ef3749a2c4..a358ecf326 100644 --- a/erts/emulator/beam/erl_db_util.c +++ b/erts/emulator/beam/erl_db_util.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1998-2013. All Rights Reserved. + * Copyright Ericsson AB 1998-2014. 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 @@ -1838,7 +1838,7 @@ restart: ep = termp; break; case matchArrayBind: /* When the array size is unknown. */ - ASSERT(termp); + ASSERT(termp || arity==0); n = *pc++; variables[n].term = dpm_array_to_list(psp, termp, arity); break; |