184012 2018-03-26 10:31:30 -0700 Unable to use HashMap<WebCore::SecurityOriginData, Ref<WebSWServerToContextConnection>> type in StorageProcess.h 2018-04-16 11:37:17 -0700 1 1 1 Unclassified WebKit Web Template Framework WebKit Nightly Build Unspecified Unspecified NEW https://bugs.webkit.org/show_bug.cgi?id=183969 P2 Normal --- 1 cdumez cdumez ap beidson darin rniwa sam youennf oldest_to_newest 1409317 0 cdumez 2018-03-26 10:31:30 -0700 Unable to use HashMap<WebCore::SecurityOriginData, RefPtr<WebSWServerToContextConnection>> type in StorageProcess.h. It causes an assertion to be hit in debug: Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 0 com.apple.JavaScriptCore 0x00000001243b97b4 WTFCrash + 36 (Assertions.cpp:271) 1 com.apple.WebKit 0x000000010f510de6 WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >::leakRef() + 70 (Ref.h:133) 2 com.apple.WebKit 0x000000010f510d51 WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >::Ref(WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >&&) + 33 (Ref.h:75) 3 com.apple.WebKit 0x000000010f510d1d WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >::Ref(WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >&&) + 29 (Ref.h:78) 4 com.apple.WebKit 0x000000010f510cec WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > >::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > >(WebCore::SecurityOriginData&&, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >&&) + 76 (KeyValuePair.h:46) 5 com.apple.WebKit 0x000000010f510c25 WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > >::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > >(WebCore::SecurityOriginData&&, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >&&) + 37 (KeyValuePair.h:46) 6 com.apple.WebKit 0x000000010f510bb9 WTF::KeyValuePairHashTraits<WTF::HashTraits<WebCore::SecurityOriginData>, WTF::HashTraits<WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >::emptyValue() + 57 (HashTraits.h:292) 7 com.apple.WebKit 0x000000010f510b79 void WTF::HashTableBucketInitializer<false>::initialize<WTF::HashMap<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >, WebCore::SecurityOriginDataHash, WTF::HashTraits<WebCore::SecurityOriginData>, WTF::HashTraits<WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >::KeyValuePairTraits, WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >(WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > >&) + 57 (HashTable.h:841) 8 com.apple.WebKit 0x000000010f510b35 WTF::HashTable<WebCore::SecurityOriginData, WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > >, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >, WebCore::SecurityOriginDataHash, WTF::HashMap<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >, WebCore::SecurityOriginDataHash, WTF::HashTraits<WebCore::SecurityOriginData>, WTF::HashTraits<WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >::KeyValuePairTraits, WTF::HashTraits<WebCore::SecurityOriginData> >::initializeBucket(WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > >&) + 21 (HashTable.h:858) 9 com.apple.WebKit 0x000000010f51095b WTF::HashTable<WebCore::SecurityOriginData, WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > >, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >, WebCore::SecurityOriginDataHash, WTF::HashMap<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >, WebCore::SecurityOriginDataHash, WTF::HashTraits<WebCore::SecurityOriginData>, WTF::HashTraits<WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >::KeyValuePairTraits, WTF::HashTraits<WebCore::SecurityOriginData> >::allocateTable(unsigned int) + 75 (HashTable.h:1148) 10 com.apple.WebKit 0x000000010f5106e8 WTF::HashTable<WebCore::SecurityOriginData, WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > >, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >, WebCore::SecurityOriginDataHash, WTF::HashMap<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >, WebCore::SecurityOriginDataHash, WTF::HashTraits<WebCore::SecurityOriginData>, WTF::HashTraits<WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >::KeyValuePairTraits, WTF::HashTraits<WebCore::SecurityOriginData> >::rehash(unsigned int, WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > >*) + 72 (HashTable.h:1197) 11 com.apple.WebKit 0x000000010f518385 WTF::HashTable<WebCore::SecurityOriginData, WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > >, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >, WebCore::SecurityOriginDataHash, WTF::HashMap<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >, WebCore::SecurityOriginDataHash, WTF::HashTraits<WebCore::SecurityOriginData>, WTF::HashTraits<WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >::KeyValuePairTraits, WTF::HashTraits<WebCore::SecurityOriginData> >::expand(WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > >*) + 117 (HashTable.h:1174) 12 com.apple.WebKit 0x000000010f51809c WTF::HashTableAddResult<WTF::HashTableIterator<WebCore::SecurityOriginData, WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > >, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >, WebCore::SecurityOriginDataHash, WTF::HashMap<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >, WebCore::SecurityOriginDataHash, WTF::HashTraits<WebCore::SecurityOriginData>, WTF::HashTraits<WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >::KeyValuePairTraits, WTF::HashTraits<WebCore::SecurityOriginData> > > WTF::HashTable<WebCore::SecurityOriginData, WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > >, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >, WebCore::SecurityOriginDataHash, WTF::HashMap<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >, WebCore::SecurityOriginDataHash, WTF::HashTraits<WebCore::SecurityOriginData>, WTF::HashTraits<WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >::KeyValuePairTraits, WTF::HashTraits<WebCore::SecurityOriginData> >::add<WTF::HashMapTranslator<WTF::HashMap<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >, WebCore::SecurityOriginDataHash, WTF::HashTraits<WebCore::SecurityOriginData>, WTF::HashTraits<WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >::KeyValuePairTraits, WebCore::SecurityOriginDataHash>, WebCore::SecurityOriginData const&, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > >(WebCore::SecurityOriginData const&&&, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >&&) + 108 (HashTable.h:869) 13 com.apple.WebKit 0x000000010f51801c WTF::HashTableAddResult<WTF::HashTableIterator<WebCore::SecurityOriginData, WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > >, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >, WebCore::SecurityOriginDataHash, WTF::HashMap<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >, WebCore::SecurityOriginDataHash, WTF::HashTraits<WebCore::SecurityOriginData>, WTF::HashTraits<WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >::KeyValuePairTraits, WTF::HashTraits<WebCore::SecurityOriginData> > > WTF::HashMap<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >, WebCore::SecurityOriginDataHash, WTF::HashTraits<WebCore::SecurityOriginData>, WTF::HashTraits<WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >::inlineAdd<WebCore::SecurityOriginData const&, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > >(WebCore::SecurityOriginData const&&&, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >&&) + 60 (HashMap.h:346) 14 com.apple.WebKit 0x000000010f505f34 WTF::HashTableAddResult<WTF::HashTableIterator<WebCore::SecurityOriginData, WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > >, WTF::KeyValuePairKeyExtractor<WTF::KeyValuePair<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >, WebCore::SecurityOriginDataHash, WTF::HashMap<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >, WebCore::SecurityOriginDataHash, WTF::HashTraits<WebCore::SecurityOriginData>, WTF::HashTraits<WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >::KeyValuePairTraits, WTF::HashTraits<WebCore::SecurityOriginData> > > WTF::HashMap<WebCore::SecurityOriginData, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >, WebCore::SecurityOriginDataHash, WTF::HashTraits<WebCore::SecurityOriginData>, WTF::HashTraits<WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > > >::add<WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> > >(WebCore::SecurityOriginData const&, WTF::Ref<WebKit::WebSWServerToContextConnection, WTF::DumbPtrTraits<WebKit::WebSWServerToContextConnection> >&&) + 52 (HashMap.h:381) 15 com.apple.WebKit 0x000000010f505616 WebKit::StorageProcess::createStorageToWebProcessConnection(bool, WebCore::SecurityOriginData&&) + 726 (StorageProcess.cpp:281) 1409318 1 cdumez 2018-03-26 10:32:01 -0700 HashMap<RefPtr<WebCore::SecurityOrigin>, RefPtr<WebSWServerToContextConnection>> type 1409319 2 cdumez 2018-03-26 10:34:16 -0700 Using HashMap<RefPtr<WebCore::SecurityOrigin>, Ref<WebSWServerToContextConnection>> works. I believe the different is that emptyValueIsZero for both the Key and the Value. emptyValueIsZero is false when the key is a SecurityOriginData. So KeyValuePairHashTraits::emptyValueIsZero goes from true to false and it causes failures. 1409320 3 cdumez 2018-03-26 10:35:40 -0700 (In reply to Chris Dumez from comment #2) > Using HashMap<RefPtr<WebCore::SecurityOrigin>, > Ref<WebSWServerToContextConnection>> works. I believe the different is that > emptyValueIsZero for both the Key and the Value. > > emptyValueIsZero is false when the key is a SecurityOriginData. So > KeyValuePairHashTraits::emptyValueIsZero goes from true to false and it > causes failures. As a result, it ends up using a different template specialization for HashTableBucketInitializer: template<bool emptyValueIsZero> struct HashTableBucketInitializer; template<> struct HashTableBucketInitializer<false> { template<typename Traits, typename Value> static void initialize(Value& bucket) { new (NotNull, std::addressof(bucket)) Value(Traits::emptyValue()); } }; template<> struct HashTableBucketInitializer<true> { template<typename Traits, typename Value> static void initialize(Value& bucket) { // This initializes the bucket without copying the empty value. // That makes it possible to use this with types that don't support copying. // The memset to 0 looks like a slow operation but is optimized by the compilers. memset(std::addressof(bucket), 0, sizeof(bucket)); } }; 1409323 4 cdumez 2018-03-26 10:41:33 -0700 (In reply to Chris Dumez from comment #3) > (In reply to Chris Dumez from comment #2) > > Using HashMap<RefPtr<WebCore::SecurityOrigin>, > > Ref<WebSWServerToContextConnection>> works. I believe the different is that > > emptyValueIsZero for both the Key and the Value. > > > > emptyValueIsZero is false when the key is a SecurityOriginData. So > > KeyValuePairHashTraits::emptyValueIsZero goes from true to false and it > > causes failures. > > As a result, it ends up using a different template specialization for > HashTableBucketInitializer: > template<bool emptyValueIsZero> struct HashTableBucketInitializer; > > template<> struct HashTableBucketInitializer<false> { > template<typename Traits, typename Value> static void > initialize(Value& bucket) > { > new (NotNull, std::addressof(bucket)) > Value(Traits::emptyValue()); > } > }; > > template<> struct HashTableBucketInitializer<true> { > template<typename Traits, typename Value> static void > initialize(Value& bucket) > { > // This initializes the bucket without copying the empty value. > // That makes it possible to use this with types that don't > support copying. > // The memset to 0 looks like a slow operation but is optimized > by the compilers. > memset(std::addressof(bucket), 0, sizeof(bucket)); > } > }; So instead of doing a memset zero, we now rely on Traits::emptyValue(), which for Ref<T> is static Ref<P> emptyValue() { return HashTableEmptyValue; } This is implemented as: Ref(HashTableEmptyValueType) : m_ptr(hashTableEmptyValue()) { } hashTableDeletedValue() returns nullptr. So when we construct a KeyValuePair: template<typename K, typename V> KeyValuePair(K&& key, V&& value) : key(std::forward<K>(key)) , value(std::forward<V>(value)) { } And V is HashTraits<Ref<T>>::emptyValue(), then it calls the Ref<T>(Ref<t>&&) move constructor, which ends up calling leakRef() on the Ref. This is implemented as: T& leakRef() WARN_UNUSED_RETURN { ASSERT(m_ptr); / ... } We hit this assertion since m_ptr is nullptr when the Ref<> is an empty HashTable value :/ Advice on how to best address this would be appreciated: 1. Dropping this assertion would be unfortunate since it is useful to catch bugs 2. Using another value than nullptr as empty HashTable value maybe? 1409570 5 darin 2018-03-27 09:55:43 -0700 So we consider it a programming error to move from a Ref that is null. But we want to use null values in the hash table. I think the best way to work around this is in the hash table machinery rather than in Ref; I don’t think we should use a value other than nullptr for empty since I think it would hurt efficiency. For this specific case, I think we could figure out how to make emptyValueIsZero be true for SecurityOriginData. I am pretty sure that works even for std::optional. 1409577 6 cdumez 2018-03-27 10:07:59 -0700 (In reply to Darin Adler from comment #5) > So we consider it a programming error to move from a Ref that is null. But > we want to use null values in the hash table. I think the best way to work > around this is in the hash table machinery rather than in Ref; I don’t think > we should use a value other than nullptr for empty since I think it would > hurt efficiency. > > For this specific case, I think we could figure out how to make > emptyValueIsZero be true for SecurityOriginData. I am pretty sure that works > even for std::optional. Fixing it only for SecurityOriginData would not be optimal IMO. Someone else is going to get caught by this in the future for another key type's whose emptyValueIsZero is false. 1409714 7 336628 cdumez 2018-03-27 16:16:58 -0700 Created attachment 336628 Patch 1414842 8 336628 rniwa 2018-04-16 11:37:17 -0700 Comment on attachment 336628 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=336628&action=review > Source/WebCore/ChangeLog:9 > + Set SecurityOriginDataHashTraits::emptyValueIsZero to true. This is OK because > + the data members of SecurityOriginData are of type String or std::optional<uint16_t>. This seems a bit fragile. Can we add an assertion somewhere to make sure this assumption holds? e.g. memset SecurityOriginData and make sure isEmpty returns true there. 336628 2018-03-27 16:16:58 -0700 2018-04-16 11:37:17 -0700 Patch bug-184012-20180327161658.patch text/plain 4196 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMDA5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGU4NTdmNzk1ZjJiN2Rl MDI3OTk1OGViYzA5ODRlYTNhZTM3N2QxOS4uZGY2MTRlOWM2MzEwNmJiNjdmNWUwYjM4NTU2NjNh MTM3OTBjOWJmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTAzLTI3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgVW5hYmxlIHRvIHVzZSBIYXNo TWFwPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0YSwgUmVmPFdlYlNXU2VydmVyVG9Db250ZXh0 Q29ubmVjdGlvbj4+IHR5cGUgaW4gU3RvcmFnZVByb2Nlc3MuaAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0MDEyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2V0IFNlY3VyaXR5T3JpZ2luRGF0YUhhc2hU cmFpdHM6OmVtcHR5VmFsdWVJc1plcm8gdG8gdHJ1ZS4gVGhpcyBpcyBPSyBiZWNhdXNlCisgICAg ICAgIHRoZSBkYXRhIG1lbWJlcnMgb2YgU2VjdXJpdHlPcmlnaW5EYXRhIGFyZSBvZiB0eXBlIFN0 cmluZyBvciBzdGQ6Om9wdGlvbmFsPHVpbnQxNl90Pi4KKworICAgICAgICBUaGlzIGlzIGJldHRl ciBmb3IgcGVyZm9ybWFuY2UgYW5kIGl0IGFsbG93cyB1c2luZyBhIFJlZjw+IHZhbHVlIGluIGEg SGFzaE1hcCB3aGVuCisgICAgICAgIHRoZSBrZXkgaXMgYSBTZWN1cml0eU9yaWdpbkRhdGEuCisK KyAgICAgICAgKiBwYWdlL1NlY3VyaXR5T3JpZ2luRGF0YS5oOgorCiAyMDE4LTAzLTI3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgQXZvaWQgY29uc3RydWN0aW5n IFNlY3VyaXR5T3JpZ2luIG9iamVjdHMgZnJvbSBub24tbWFpbiB0aHJlYWRzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4 IGJkMjQwOTU5YTQyZTA5ZDk0ZGU2ZWNiZTg1YzZhM2M2ZDBmZjkwYTIuLjY1Zjk5MTA4YzE0NDcw NDQzNGRiM2FkMGVhNzg1MjU3Y2M1ZjY4ODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIw MTgtMDMtMjcgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBVbmFi bGUgdG8gdXNlIEhhc2hNYXA8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhLCBSZWY8V2ViU1dT ZXJ2ZXJUb0NvbnRleHRDb25uZWN0aW9uPj4gdHlwZSBpbiBTdG9yYWdlUHJvY2Vzcy5oCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODQwMTIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgYSBSZWY8V2Vi U1dTZXJ2ZXJUb0NvbnRleHRDb25uZWN0aW9uPiBhcyB2YWx1ZSBpbiB0aGUgSGFzaE1hcCBub3cg dGhhdCBpdCB3b3Jrcy4KKworICAgICAgICAqIFN0b3JhZ2VQcm9jZXNzL1N0b3JhZ2VQcm9jZXNz LmNwcDoKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZVByb2Nlc3M6OmNvbm5lY3Rpb25Ub0NvbnRl eHRQcm9jZXNzRnJvbUlQQ0Nvbm5lY3Rpb24pOgorICAgICAgICAqIFN0b3JhZ2VQcm9jZXNzL1N0 b3JhZ2VQcm9jZXNzLmg6CisKIDIwMTgtMDMtMjcgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxl LmNvbT4KIAogICAgICAgICBBdm9pZCBjb25zdHJ1Y3RpbmcgU2VjdXJpdHlPcmlnaW4gb2JqZWN0 cyBmcm9tIG5vbi1tYWluIHRocmVhZHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv U2VjdXJpdHlPcmlnaW5EYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2lu RGF0YS5oCmluZGV4IDc5OTAyMzljOGRkYWMyMzliYjM5MmJlNDRlYzQyMmMwMzE1MmJjNmYuLmE5 Mzk0ODBmMjdjZGZmNTJhMGE2ZTZlYTM3MWU0NjY4OTI0YjJiYmIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW5EYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9TZWN1cml0eU9yaWdpbkRhdGEuaApAQCAtMTI0LDcgKzEyNCw3IEBAIHN0ZDo6b3B0aW9u YWw8U2VjdXJpdHlPcmlnaW5EYXRhPiBTZWN1cml0eU9yaWdpbkRhdGE6OmRlY29kZShEZWNvZGVy JiBkZWNvZGVyKQogCiBzdHJ1Y3QgU2VjdXJpdHlPcmlnaW5EYXRhSGFzaFRyYWl0cyA6IFdURjo6 U2ltcGxlQ2xhc3NIYXNoVHJhaXRzPFNlY3VyaXR5T3JpZ2luRGF0YT4gewogICAgIHN0YXRpYyBj b25zdCBib29sIGhhc0lzRW1wdHlWYWx1ZUZ1bmN0aW9uID0gdHJ1ZTsKLSAgICBzdGF0aWMgY29u c3QgYm9vbCBlbXB0eVZhbHVlSXNaZXJvID0gZmFsc2U7CisgICAgc3RhdGljIGNvbnN0IGJvb2wg ZW1wdHlWYWx1ZUlzWmVybyA9IHRydWU7CiAgICAgc3RhdGljIGJvb2wgaXNFbXB0eVZhbHVlKGNv bnN0IFNlY3VyaXR5T3JpZ2luRGF0YSYgZGF0YSkgeyByZXR1cm4gZGF0YS5pc0VtcHR5KCk7IH0K IH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU3RvcmFnZVByb2Nlc3MvU3RvcmFnZVBy b2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdC9TdG9yYWdlUHJvY2Vzcy9TdG9yYWdlUHJvY2Vzcy5j cHAKaW5kZXggZDkwYjNmYmFhZTBjMWFiMGUwY2Y4YTNkNWYzY2ZhZWNhZTE3ODVmMC4uZjg1NzI0 ZWE2ZmU2ZmM1OGU5YmQ0NDJiMTFjMTA2ZmE3M2RlNjc2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9TdG9yYWdlUHJvY2Vzcy9TdG9yYWdlUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktp dC9TdG9yYWdlUHJvY2Vzcy9TdG9yYWdlUHJvY2Vzcy5jcHAKQEAgLTkxLDcgKzkxLDcgQEAgV2Vi U1dTZXJ2ZXJUb0NvbnRleHRDb25uZWN0aW9uKiBTdG9yYWdlUHJvY2Vzczo6Y29ubmVjdGlvblRv Q29udGV4dFByb2Nlc3NGcm9tSVAKIHsKICAgICBmb3IgKGF1dG8mIHNlcnZlclRvQ29udGV4dENv bm5lY3Rpb24gOiBtX3NlcnZlclRvQ29udGV4dENvbm5lY3Rpb25zLnZhbHVlcygpKSB7CiAgICAg ICAgIGlmIChzZXJ2ZXJUb0NvbnRleHRDb25uZWN0aW9uLT5pcGNDb25uZWN0aW9uKCkgPT0gJmNv bm5lY3Rpb24pCi0gICAgICAgICAgICByZXR1cm4gc2VydmVyVG9Db250ZXh0Q29ubmVjdGlvbi5n ZXQoKTsKKyAgICAgICAgICAgIHJldHVybiBzZXJ2ZXJUb0NvbnRleHRDb25uZWN0aW9uLnB0cigp OwogICAgIH0KICAgICByZXR1cm4gbnVsbHB0cjsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvU3RvcmFnZVByb2Nlc3MvU3RvcmFnZVByb2Nlc3MuaCBiL1NvdXJjZS9XZWJLaXQvU3RvcmFn ZVByb2Nlc3MvU3RvcmFnZVByb2Nlc3MuaAppbmRleCA2MDEwYTllZjE5NmI3YmFmNWNiMzM4Nzc1 ODVhMGQ2YzQwNTFlMDE5Li4yMDc4YTEzMTA3Mzk4NThjYzRiMjdjMmM1YjMxNzNjYzVmNGE5ZWU0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1N0b3JhZ2VQcm9jZXNzL1N0b3JhZ2VQcm9jZXNz LmgKKysrIGIvU291cmNlL1dlYktpdC9TdG9yYWdlUHJvY2Vzcy9TdG9yYWdlUHJvY2Vzcy5oCkBA IC0xNzYsNyArMTc2LDcgQEAgcHJpdmF0ZToKICNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCiAg ICAgdm9pZCBkaWRDcmVhdGVXb3JrZXJDb250ZXh0UHJvY2Vzc0Nvbm5lY3Rpb24oY29uc3QgSVBD OjpBdHRhY2htZW50Jik7CiAKLSAgICBIYXNoTWFwPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luRGF0 YSwgUmVmUHRyPFdlYlNXU2VydmVyVG9Db250ZXh0Q29ubmVjdGlvbj4+IG1fc2VydmVyVG9Db250 ZXh0Q29ubmVjdGlvbnM7CisgICAgSGFzaE1hcDxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGEs IFJlZjxXZWJTV1NlcnZlclRvQ29udGV4dENvbm5lY3Rpb24+PiBtX3NlcnZlclRvQ29udGV4dENv bm5lY3Rpb25zOwogICAgIGJvb2wgbV93YWl0aW5nRm9yU2VydmVyVG9Db250ZXh0UHJvY2Vzc0Nv bm5lY3Rpb24geyBmYWxzZSB9OwogICAgIGJvb2wgbV9zaG91bGREaXNhYmxlU2VydmljZVdvcmtl clByb2Nlc3NUZXJtaW5hdGlvbkRlbGF5IHsgZmFsc2UgfTsKICAgICBIYXNoTWFwPFBBTDo6U2Vz c2lvbklELCBTdHJpbmc+IG1fc3dEYXRhYmFzZVBhdGhzOwo=