From 76b1aaa9b0b764549822b441f196d49295214bb9 Mon Sep 17 00:00:00 2001 From: Jon Anderson Date: Fri, 28 Dec 2018 17:22:57 -0800 Subject: [PATCH] Added additional guards for Keywords.merge/3. Added guards to ensure only lists can be passed to Keywords.merge/3. --- lib/elixir/lib/keyword.ex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/elixir/lib/keyword.ex b/lib/elixir/lib/keyword.ex index abb283b0114..2990bf37e40 100644 --- a/lib/elixir/lib/keyword.ex +++ b/lib/elixir/lib/keyword.ex @@ -704,8 +704,8 @@ defmodule Keyword do @spec merge(t, t) :: t def merge(keywords1, keywords2) - def merge(keywords1, []), do: keywords1 - def merge([], keywords2), do: keywords2 + def merge(keywords1, []) when is_list(keywords1), do: keywords1 + def merge([], keywords2) when is_list(keywords2), do: keywords2 def merge(keywords1, keywords2) when is_list(keywords1) and is_list(keywords2) do if keyword?(keywords2) do