Make sure last wins on bad queries works with maps (#1107)

Author: LostKobrakai

lib/plug/conn/query.ex

@@ -168,9 +168,12 @@ defmodule Plug.Conn.Query do
     parts = :binary.split(rest, pattern)
 
     case acc do
-      %{^key => current} ->
+      %{^key => current} when is_list(current) or is_map(current) ->
         Map.put(acc, key, assign_split(parts, value, current, pattern))
 
+      %{^key => _} ->
+        acc
+
       %{} ->
         Map.put(acc, key, assign_split(parts, value, :none, pattern))
 

test/plug/conn/query_test.exs

@@ -51,6 +51,7 @@ defmodule Plug.Conn.QueryTest do
     assert decode("x[]=1&x[y]=1")["x"]["y"] == "1"
     assert decode("x[y][][w]=2&x[y]=1")["x"]["y"] == "1"
     assert decode("x=1&x[y]=1")["x"]["y"] == "1"
+    assert decode("x[y][0][w]=2&x[y]=1")["x"]["y"] == "1"
   end
 
   test "decode_pair simple queries" do