commit 3070103460b3aa2a79d8ae45412eb325f5a58d41
author David Schinazi <dschinazi@google.com> Wed May 01 14:10:08 2019 -0700
committer David Schinazi <dschinazi@google.com> Wed May 01 14:10:08 2019 -0700
tree 142a4c76b1f5f3d01254083f1dfbad0fba82818d
parent f07c70059c04547121daccdcf112832ecec8876a

Fix preferred address CID length

quic/core/crypto/transport_parameters.cc

diff --git a/quic/core/crypto/transport_parameters.cc b/quic/core/crypto/transport_parameters.cc
index 8982ae0..ee0ebf0 100644
--- a/quic/core/crypto/transport_parameters.cc
+++ b/quic/core/crypto/transport_parameters.cc
@@ -472,8 +472,8 @@
             v6_address_bytes.length()) ||
         !CBB_add_u16(&preferred_address_params,
                      in.preferred_address->ipv6_socket_address.port()) ||
-        !CBB_add_u16_length_prefixed(&preferred_address_params,
-                                     &preferred_address_connection_id_param) ||
+        !CBB_add_u8_length_prefixed(&preferred_address_params,
+                                    &preferred_address_connection_id_param) ||
         !CBB_add_bytes(&preferred_address_connection_id_param,
                        reinterpret_cast<const uint8_t*>(
                            in.preferred_address->connection_id.data()),
@@ -663,7 +663,7 @@
           return false;
         }
         CBS connection_id_cbs;
-        if (!CBS_get_u16_length_prefixed(&value, &connection_id_cbs)) {
+        if (!CBS_get_u8_length_prefixed(&value, &connection_id_cbs)) {
           QUIC_DLOG(ERROR)
               << "Failed to parse length of preferred address connection ID";
           return false;