225271 2021-05-01 09:24:32 -0700 Generated JS bindings for JSValue -> IDL dictionary don't take into account runtime settings 2021-05-01 10:16:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 225140 1 sam sam ashvayka cdumez darin ews-watchlist webkit-bug-importer oldest_to_newest 1755952 0 sam 2021-05-01 09:24:32 -0700 Generated JS bindings for JSValue -> IDL dictionary don't take into account runtime settings 1755953 1 427501 sam 2021-05-01 09:27:20 -0700 Created attachment 427501 Patch 1755954 2 427502 sam 2021-05-01 09:34:10 -0700 Created attachment 427502 Patch 1755963 3 427502 ashvayka 2021-05-01 10:00:30 -0700 Comment on attachment 427502 Patch Nicely done! 1755964 4 ews-feeder 2021-05-01 10:15:09 -0700 Committed r276874 (237220@main): <https://commits.webkit.org/237220@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 427502. 1755965 5 webkit-bug-importer 2021-05-01 10:16:16 -0700 <rdar://problem/77419257> 427501 2021-05-01 09:27:20 -0700 2021-05-01 09:36:12 -0700 Patch bug-225271-20210501092719.patch text/plain 14474 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI3Njg3MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA1LTAxICBTYW0gV2Vp bmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBHZW5lcmF0ZWQgSlMgYmluZGluZ3Mg Zm9yIEpTVmFsdWUgLT4gSURMIGRpY3Rpb25hcnkgZG9uJ3QgdGFrZSBpbnRvIGFjY291bnQgcnVu dGltZSBzZXR0aW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjI1MjcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV2hpbGUgd2UgZGlkIGFjY291bnQgZm9yIFNldHRpbmdzL1J1bnRpbWVFbmFibGVkRmVh dHVyZXMvZXRjIHdoZW4gY29udmVydGluZyBmcm9tIGEKKyAgICAgICAgZGljdGlvbmFyeSB0byBh IEpTVmFsdWUsIHdlIGZvcmdvdCB0byBhZGQgY29kZSB0byBza2lwIHRyeWluZyB0byByZWFkIHRo ZSBwcm9wZXJ0aWVzCisgICAgICAgIGluIG9uIGluZ2VzdGlvbi4KKworICAgICAgICAqIGJpbmRp bmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtOgorICAgICAgICAoR2VuZXJhdGVEaWN0aW9u YXJ5SW1wbGVtZW50YXRpb25Db250ZW50KToKKyAgICAgICAgTWF0Y2ggY29udmVydERpY3Rpb25h cnlUb0pTIGFuZCBhZGQgZ3VhcmQgKyBpbmRlbnQgaWYgdGhlIHByb3BlcnR5IGhhcyBhIHJ1bnRp bWUgZmxhZy4KKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3REZXJp dmVkRGljdGlvbmFyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb252ZXJ0RGljdGlvbmFyeTxU ZXN0RGVyaXZlZERpY3Rpb25hcnk+KToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3Qv SlMvSlNUZXN0RGVyaXZlZERpY3Rpb25hcnkyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvbnZl cnREaWN0aW9uYXJ5PFRlc3REZXJpdmVkRGljdGlvbmFyeTI6OkRpY3Rpb25hcnk+KToKKyAgICAg ICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0SW5oZXJpdGVkRGljdGlvbmFyeS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpjb252ZXJ0RGljdGlvbmFyeTxUZXN0SW5oZXJpdGVkRGlj dGlvbmFyeT4pOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RTdGFu ZGFsb25lRGljdGlvbmFyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb252ZXJ0RGljdGlvbmFy eTxEaWN0aW9uYXJ5SW1wbE5hbWU+KToKKyAgICAgICAgVXBkYXRlIHRlc3QgcmVzdWx0cy4KKwog MjAyMS0wNS0wMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtS ZW5kZXJUcmVlQnVpbGRlcl0gUmVzZXQgdGhlICJjaGlsZHJlbiBpbmxpbmUiIHN0YXRlIHdoZW4g bWVyZ2luZyBhbm9ueW1vdXMgdGFibGUgYm94ZXMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtCShyZXZpc2lvbiAyNzY4MTkp CisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQko d29ya2luZyBjb3B5KQpAQCAtMjYyMCw0MCArMjYyMCw1MiBAQCBzdWIgR2VuZXJhdGVEaWN0aW9u YXJ5SW1wbGVtZW50YXRpb25Db250CiAgICAgICAgICAgICAgICAgJHJlc3VsdCAuPSAiI2lmICR7 Y29uZGl0aW9uYWxTdHJpbmd9XG4iOwogICAgICAgICAgICAgfQogCisgICAgICAgICAgICBteSAk bmVlZHNSdW50aW1lQ2hlY2sgPSBOZWVkc1J1bnRpbWVDaGVjaygkZGljdGlvbmFyeSwgJG1lbWJl cik7CisgICAgICAgICAgICBteSAkaW5kZW50ID0gIiI7CisgICAgICAgICAgICBpZiAoJG5lZWRz UnVudGltZUNoZWNrKSB7CisgICAgICAgICAgICAgICAgbXkgJHJ1bnRpbWVFbmFibGVDb25kaXRp b25hbFN0cmluZyA9IEdlbmVyYXRlUnVudGltZUVuYWJsZUNvbmRpdGlvbmFsU3RyaW5nKCRkaWN0 aW9uYXJ5LCAkbWVtYmVyLCAiJmdsb2JhbE9iamVjdCIpOworICAgICAgICAgICAgICAgICRyZXN1 bHQgLj0gIiAgICBpZiAoJHtydW50aW1lRW5hYmxlQ29uZGl0aW9uYWxTdHJpbmd9KSB7XG4iOwor ICAgICAgICAgICAgICAgICRpbmRlbnQgPSAiICAgICI7CisgICAgICAgICAgICB9CisKICAgICAg ICAgICAgICMgNC4xLiBMZXQga2V5IGJlIHRoZSBpZGVudGlmaWVyIG9mIG1lbWJlci4KICAgICAg ICAgICAgIG15ICRrZXkgPSAkbWVtYmVyLT5uYW1lOwogICAgICAgICAgICAgbXkgJGltcGxlbWVu dGVkQXNLZXkgPSAkbWVtYmVyLT5leHRlbmRlZEF0dHJpYnV0ZXMtPntJbXBsZW1lbnRlZEFzfSB8 fCAka2V5OwogCiAgICAgICAgICAgICAjIDQuMi4gTGV0IHZhbHVlIGJlIGFuIEVDTUFTY3JpcHQg dmFsdWUsIGRlcGVuZGluZyBvbiBUeXBlKFYpOgotICAgICAgICAgICAgJHJlc3VsdCAuPSAiICAg IEpTVmFsdWUgJHtrZXl9VmFsdWU7XG4iOwotICAgICAgICAgICAgJHJlc3VsdCAuPSAiICAgIGlm IChpc051bGxPclVuZGVmaW5lZClcbiI7Ci0gICAgICAgICAgICAkcmVzdWx0IC49ICIgICAgICAg ICR7a2V5fVZhbHVlID0ganNVbmRlZmluZWQoKTtcbiI7Ci0gICAgICAgICAgICAkcmVzdWx0IC49 ICIgICAgZWxzZSB7XG4iOwotICAgICAgICAgICAgJHJlc3VsdCAuPSAiICAgICAgICAke2tleX1W YWx1ZSA9IG9iamVjdC0+Z2V0KCZsZXhpY2FsR2xvYmFsT2JqZWN0LCBJZGVudGlmaWVyOjpmcm9t U3RyaW5nKHZtLCBcIiR7a2V5fVwiKSk7XG4iOwotICAgICAgICAgICAgJHJlc3VsdCAuPSAiICAg ICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIHsgfSk7XG4iOwotICAgICAgICAg ICAgJHJlc3VsdCAuPSAiICAgIH1cbiI7CisgICAgICAgICAgICAkcmVzdWx0IC49ICIke2luZGVu dH0gICAgSlNWYWx1ZSAke2tleX1WYWx1ZTtcbiI7CisgICAgICAgICAgICAkcmVzdWx0IC49ICIk e2luZGVudH0gICAgaWYgKGlzTnVsbE9yVW5kZWZpbmVkKVxuIjsKKyAgICAgICAgICAgICRyZXN1 bHQgLj0gIiR7aW5kZW50fSAgICAgICAgJHtrZXl9VmFsdWUgPSBqc1VuZGVmaW5lZCgpO1xuIjsK KyAgICAgICAgICAgICRyZXN1bHQgLj0gIiR7aW5kZW50fSAgICBlbHNlIHtcbiI7CisgICAgICAg ICAgICAkcmVzdWx0IC49ICIke2luZGVudH0gICAgICAgICR7a2V5fVZhbHVlID0gb2JqZWN0LT5n ZXQoJmxleGljYWxHbG9iYWxPYmplY3QsIElkZW50aWZpZXI6OmZyb21TdHJpbmcodm0sIFwiJHtr ZXl9XCIpKTtcbiI7CisgICAgICAgICAgICAkcmVzdWx0IC49ICIke2luZGVudH0gICAgICAgIFJF VFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgeyB9KTtcbiI7CisgICAgICAgICAgICAkcmVz dWx0IC49ICIke2luZGVudH0gICAgfVxuIjsKIAogICAgICAgICAgICAgbXkgJElETFR5cGUgPSBH ZXRJRExUeXBlKCR0eXBlU2NvcGUsICR0eXBlKTsKIAogICAgICAgICAgICAgIyA0LjMuIElmIHZh bHVlIGlzIG5vdCB1bmRlZmluZWQsIHRoZW46Ci0gICAgICAgICAgICAkcmVzdWx0IC49ICIgICAg aWYgKCEke2tleX1WYWx1ZS5pc1VuZGVmaW5lZCgpKSB7XG4iOworICAgICAgICAgICAgJHJlc3Vs dCAuPSAiJHtpbmRlbnR9ICAgIGlmICghJHtrZXl9VmFsdWUuaXNVbmRlZmluZWQoKSkge1xuIjsK IAogICAgICAgICAgICAgbXkgJG5hdGl2ZVZhbHVlID0gSlNWYWx1ZVRvTmF0aXZlKCR0eXBlU2Nv cGUsICRtZW1iZXIsICIke2tleX1WYWx1ZSIsICRtZW1iZXItPmV4dGVuZGVkQXR0cmlidXRlcy0+ e0NvbmRpdGlvbmFsfSwgIiZsZXhpY2FsR2xvYmFsT2JqZWN0IiwgImxleGljYWxHbG9iYWxPYmpl Y3QiLCAiIiwgIipqc0Nhc3Q8SlNET01HbG9iYWxPYmplY3QqPigmbGV4aWNhbEdsb2JhbE9iamVj dCkiKTsKLSAgICAgICAgICAgICRyZXN1bHQgLj0gIiAgICAgICAgcmVzdWx0LiRpbXBsZW1lbnRl ZEFzS2V5ID0gJG5hdGl2ZVZhbHVlO1xuIjsKLSAgICAgICAgICAgICRyZXN1bHQgLj0gIiAgICAg ICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB7IH0pO1xuIjsKKyAgICAgICAgICAg ICRyZXN1bHQgLj0gIiR7aW5kZW50fSAgICAgICAgcmVzdWx0LiRpbXBsZW1lbnRlZEFzS2V5ID0g JG5hdGl2ZVZhbHVlO1xuIjsKKyAgICAgICAgICAgICRyZXN1bHQgLj0gIiR7aW5kZW50fSAgICAg ICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB7IH0pO1xuIjsKIAogICAgICAgICAg ICAgIyBWYWx1ZSBpcyB1bmRlZmluZWQuCiAgICAgICAgICAgICAjIDQuNC4gT3RoZXJ3aXNlLCBp ZiB2YWx1ZSBpcyB1bmRlZmluZWQgYnV0IHRoZSBkaWN0aW9uYXJ5IG1lbWJlciBoYXMgYSBkZWZh dWx0IHZhbHVlLCB0aGVuOgogICAgICAgICAgICAgaWYgKCEkbWVtYmVyLT5pc1JlcXVpcmVkICYm IGRlZmluZWQgJG1lbWJlci0+ZGVmYXVsdCkgewotICAgICAgICAgICAgICAgICRyZXN1bHQgLj0g IiAgICB9IGVsc2VcbiI7Ci0gICAgICAgICAgICAgICAgJHJlc3VsdCAuPSAiICAgICAgICByZXN1 bHQuJGltcGxlbWVudGVkQXNLZXkgPSAiIC4gR2VuZXJhdGVEZWZhdWx0VmFsdWUoJHR5cGVTY29w ZSwgJG1lbWJlciwgJG1lbWJlci0+dHlwZSwgJG1lbWJlci0+ZGVmYXVsdCkgLiAiO1xuIjsKKyAg ICAgICAgICAgICAgICAkcmVzdWx0IC49ICIke2luZGVudH0gICAgfSBlbHNlXG4iOworICAgICAg ICAgICAgICAgICRyZXN1bHQgLj0gIiR7aW5kZW50fSAgICAgICAgcmVzdWx0LiRpbXBsZW1lbnRl ZEFzS2V5ID0gIiAuIEdlbmVyYXRlRGVmYXVsdFZhbHVlKCR0eXBlU2NvcGUsICRtZW1iZXIsICRt ZW1iZXItPnR5cGUsICRtZW1iZXItPmRlZmF1bHQpIC4gIjtcbiI7CiAgICAgICAgICAgICB9IGVs c2lmICgkbWVtYmVyLT5pc1JlcXVpcmVkKSB7CiAgICAgICAgICAgICAgICAgIyA0LjUuIE90aGVy d2lzZSwgaWYgdmFsdWUgaXMgdW5kZWZpbmVkIGFuZCB0aGUgZGljdGlvbmFyeSBtZW1iZXIgaXMg YSByZXF1aXJlZCBkaWN0aW9uYXJ5IG1lbWJlciwgdGhlbiB0aHJvdyBhIFR5cGVFcnJvci4KLSAg ICAgICAgICAgICAgICAkcmVzdWx0IC49ICIgICAgfSBlbHNlIHtcbiI7Ci0gICAgICAgICAgICAg ICAgJHJlc3VsdCAuPSAiICAgICAgICB0aHJvd1JlcXVpcmVkTWVtYmVyVHlwZUVycm9yKGxleGlj YWxHbG9iYWxPYmplY3QsIHRocm93U2NvcGUsIFwiIi4gJG1lbWJlci0+bmFtZSAuIlwiLCBcIiRu YW1lXCIsIFwiIi4gR2V0VHlwZU5hbWVGb3JEaXNwbGF5SW5FeGNlcHRpb24oJHR5cGUpIC4iXCIp O1xuIjsKLSAgICAgICAgICAgICAgICAkcmVzdWx0IC49ICIgICAgICAgIHJldHVybiB7IH07XG4i OwotICAgICAgICAgICAgICAgICRyZXN1bHQgLj0gIiAgICB9XG4iOworICAgICAgICAgICAgICAg ICRyZXN1bHQgLj0gIiR7aW5kZW50fSAgICB9IGVsc2Uge1xuIjsKKyAgICAgICAgICAgICAgICAk cmVzdWx0IC49ICIke2luZGVudH0gICAgICAgIHRocm93UmVxdWlyZWRNZW1iZXJUeXBlRXJyb3Io bGV4aWNhbEdsb2JhbE9iamVjdCwgdGhyb3dTY29wZSwgXCIiLiAkbWVtYmVyLT5uYW1lIC4iXCIs IFwiJG5hbWVcIiwgXCIiLiBHZXRUeXBlTmFtZUZvckRpc3BsYXlJbkV4Y2VwdGlvbigkdHlwZSkg LiJcIik7XG4iOworICAgICAgICAgICAgICAgICRyZXN1bHQgLj0gIiR7aW5kZW50fSAgICAgICAg cmV0dXJuIHsgfTtcbiI7CisgICAgICAgICAgICAgICAgJHJlc3VsdCAuPSAiJHtpbmRlbnR9ICAg IH1cbiI7CiAgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgICRyZXN1bHQgLj0g IiR7aW5kZW50fSAgICB9XG4iOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBpZiAoJG5l ZWRzUnVudGltZUNoZWNrKSB7CiAgICAgICAgICAgICAgICAgJHJlc3VsdCAuPSAiICAgIH1cbiI7 CiAgICAgICAgICAgICB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv dGVzdC9KUy9KU1Rlc3REZXJpdmVkRGljdGlvbmFyeTIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3REZXJpdmVkRGljdGlvbmFy eTIuY3BwCShyZXZpc2lvbiAyNzY4MTkpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL3Rlc3QvSlMvSlNUZXN0RGVyaXZlZERpY3Rpb25hcnkyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMjExLDE2ICsyMTEsMTggQEAgdGVtcGxhdGU8PiBUZXN0RGVyaXZlZERpY3Rpb25hcnkyOjpE aWN0aQogICAgICAgICByZXN1bHQucGFydGlhbFN0cmluZ01lbWJlciA9IGNvbnZlcnQ8SURMRE9N U3RyaW5nPihsZXhpY2FsR2xvYmFsT2JqZWN0LCBwYXJ0aWFsU3RyaW5nTWVtYmVyVmFsdWUpOwog ICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIHsgfSk7CiAgICAgfQotICAg IEpTVmFsdWUgcGFydGlhbFN0cmluZ01lbWJlcldpdGhFbmFibGVkQnlTZXR0aW5nVmFsdWU7Ci0g ICAgaWYgKGlzTnVsbE9yVW5kZWZpbmVkKQotICAgICAgICBwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0 aEVuYWJsZWRCeVNldHRpbmdWYWx1ZSA9IGpzVW5kZWZpbmVkKCk7Ci0gICAgZWxzZSB7Ci0gICAg ICAgIHBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1ZhbHVlID0gb2JqZWN0 LT5nZXQoJmxleGljYWxHbG9iYWxPYmplY3QsIElkZW50aWZpZXI6OmZyb21TdHJpbmcodm0sICJw YXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmciKSk7Ci0gICAgICAgIFJFVFVS Tl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgeyB9KTsKLSAgICB9Ci0gICAgaWYgKCFwYXJ0aWFs U3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmdWYWx1ZS5pc1VuZGVmaW5lZCgpKSB7Ci0g ICAgICAgIHJlc3VsdC5wYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmcgPSBj b252ZXJ0PElETERPTVN0cmluZz4obGV4aWNhbEdsb2JhbE9iamVjdCwgcGFydGlhbFN0cmluZ01l bWJlcldpdGhFbmFibGVkQnlTZXR0aW5nVmFsdWUpOwotICAgICAgICBSRVRVUk5fSUZfRVhDRVBU SU9OKHRocm93U2NvcGUsIHsgfSk7CisgICAgaWYgKGpzQ2FzdDxKU0RPTUdsb2JhbE9iamVjdCo+ KCZnbG9iYWxPYmplY3QpLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPnNldHRpbmdzVmFsdWVz KCkudGVzdFNldHRpbmdFbmFibGVkKSB7CisgICAgICAgIEpTVmFsdWUgcGFydGlhbFN0cmluZ01l bWJlcldpdGhFbmFibGVkQnlTZXR0aW5nVmFsdWU7CisgICAgICAgIGlmIChpc051bGxPclVuZGVm aW5lZCkKKyAgICAgICAgICAgIHBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGlu Z1ZhbHVlID0ganNVbmRlZmluZWQoKTsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICBwYXJ0 aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmdWYWx1ZSA9IG9iamVjdC0+Z2V0KCZs ZXhpY2FsR2xvYmFsT2JqZWN0LCBJZGVudGlmaWVyOjpmcm9tU3RyaW5nKHZtLCAicGFydGlhbFN0 cmluZ01lbWJlcldpdGhFbmFibGVkQnlTZXR0aW5nIikpOworICAgICAgICAgICAgUkVUVVJOX0lG X0VYQ0VQVElPTih0aHJvd1Njb3BlLCB7IH0pOworICAgICAgICB9CisgICAgICAgIGlmICghcGFy dGlhbFN0cmluZ01lbWJlcldpdGhFbmFibGVkQnlTZXR0aW5nVmFsdWUuaXNVbmRlZmluZWQoKSkg eworICAgICAgICAgICAgcmVzdWx0LnBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0 dGluZyA9IGNvbnZlcnQ8SURMRE9NU3RyaW5nPihsZXhpY2FsR2xvYmFsT2JqZWN0LCBwYXJ0aWFs U3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmdWYWx1ZSk7CisgICAgICAgICAgICBSRVRV Uk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIHsgfSk7CisgICAgICAgIH0KICAgICB9CiAgICAg SlNWYWx1ZSBwYXJ0aWFsVW5zaWduZWRMb25nTWVtYmVyV2l0aEltcGxlbWVudGVkQXNWYWx1ZTsK ICAgICBpZiAoaXNOdWxsT3JVbmRlZmluZWQpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0RGVyaXZlZERpY3Rpb25hcnkuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3REZXJpdmVk RGljdGlvbmFyeS5jcHAJKHJldmlzaW9uIDI3NjgxOSkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3REZXJpdmVkRGljdGlvbmFyeS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTEyOCwxNiArMTI4LDE4IEBAIHRlbXBsYXRlPD4gVGVzdERlcml2ZWREaWN0aW9u YXJ5IGNvbnZlcnQKICAgICAgICAgcmVzdWx0LnBhcnRpYWxTdHJpbmdNZW1iZXIgPSBjb252ZXJ0 PElETERPTVN0cmluZz4obGV4aWNhbEdsb2JhbE9iamVjdCwgcGFydGlhbFN0cmluZ01lbWJlclZh bHVlKTsKICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB7IH0pOwogICAg IH0KLSAgICBKU1ZhbHVlIHBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1Zh bHVlOwotICAgIGlmIChpc051bGxPclVuZGVmaW5lZCkKLSAgICAgICAgcGFydGlhbFN0cmluZ01l bWJlcldpdGhFbmFibGVkQnlTZXR0aW5nVmFsdWUgPSBqc1VuZGVmaW5lZCgpOwotICAgIGVsc2Ug ewotICAgICAgICBwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmdWYWx1ZSA9 IG9iamVjdC0+Z2V0KCZsZXhpY2FsR2xvYmFsT2JqZWN0LCBJZGVudGlmaWVyOjpmcm9tU3RyaW5n KHZtLCAicGFydGlhbFN0cmluZ01lbWJlcldpdGhFbmFibGVkQnlTZXR0aW5nIikpOwotICAgICAg ICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIHsgfSk7Ci0gICAgfQotICAgIGlmICgh cGFydGlhbFN0cmluZ01lbWJlcldpdGhFbmFibGVkQnlTZXR0aW5nVmFsdWUuaXNVbmRlZmluZWQo KSkgewotICAgICAgICByZXN1bHQucGFydGlhbFN0cmluZ01lbWJlcldpdGhFbmFibGVkQnlTZXR0 aW5nID0gY29udmVydDxJRExET01TdHJpbmc+KGxleGljYWxHbG9iYWxPYmplY3QsIHBhcnRpYWxT dHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1ZhbHVlKTsKLSAgICAgICAgUkVUVVJOX0lG X0VYQ0VQVElPTih0aHJvd1Njb3BlLCB7IH0pOworICAgIGlmIChqc0Nhc3Q8SlNET01HbG9iYWxP YmplY3QqPigmZ2xvYmFsT2JqZWN0KS0+c2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5zZXR0aW5n c1ZhbHVlcygpLnRlc3RTZXR0aW5nRW5hYmxlZCkgeworICAgICAgICBKU1ZhbHVlIHBhcnRpYWxT dHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1ZhbHVlOworICAgICAgICBpZiAoaXNOdWxs T3JVbmRlZmluZWQpCisgICAgICAgICAgICBwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRC eVNldHRpbmdWYWx1ZSA9IGpzVW5kZWZpbmVkKCk7CisgICAgICAgIGVsc2UgeworICAgICAgICAg ICAgcGFydGlhbFN0cmluZ01lbWJlcldpdGhFbmFibGVkQnlTZXR0aW5nVmFsdWUgPSBvYmplY3Qt PmdldCgmbGV4aWNhbEdsb2JhbE9iamVjdCwgSWRlbnRpZmllcjo6ZnJvbVN0cmluZyh2bSwgInBh cnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZyIpKTsKKyAgICAgICAgICAgIFJF VFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgeyB9KTsKKyAgICAgICAgfQorICAgICAgICBp ZiAoIXBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1ZhbHVlLmlzVW5kZWZp bmVkKCkpIHsKKyAgICAgICAgICAgIHJlc3VsdC5wYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJs ZWRCeVNldHRpbmcgPSBjb252ZXJ0PElETERPTVN0cmluZz4obGV4aWNhbEdsb2JhbE9iamVjdCwg cGFydGlhbFN0cmluZ01lbWJlcldpdGhFbmFibGVkQnlTZXR0aW5nVmFsdWUpOworICAgICAgICAg ICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB7IH0pOworICAgICAgICB9CiAgICAg fQogICAgIEpTVmFsdWUgcGFydGlhbFVuc2lnbmVkTG9uZ01lbWJlcldpdGhJbXBsZW1lbnRlZEFz VmFsdWU7CiAgICAgaWYgKGlzTnVsbE9yVW5kZWZpbmVkKQpJbmRleDogU291cmNlL1dlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdEluaGVyaXRlZERpY3Rpb25hcnkuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rl c3RJbmhlcml0ZWREaWN0aW9uYXJ5LmNwcAkocmV2aXNpb24gMjc2ODE5KQorKysgU291cmNlL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdEluaGVyaXRlZERpY3Rpb25hcnku Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjgsMTYgKzEyOCwxOCBAQCB0ZW1wbGF0ZTw+IFRlc3RJ bmhlcml0ZWREaWN0aW9uYXJ5IGNvbnZlCiAgICAgICAgIHJlc3VsdC5wYXJ0aWFsU3RyaW5nTWVt YmVyID0gY29udmVydDxJRExET01TdHJpbmc+KGxleGljYWxHbG9iYWxPYmplY3QsIHBhcnRpYWxT dHJpbmdNZW1iZXJWYWx1ZSk7CiAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29w ZSwgeyB9KTsKICAgICB9Ci0gICAgSlNWYWx1ZSBwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJs ZWRCeVNldHRpbmdWYWx1ZTsKLSAgICBpZiAoaXNOdWxsT3JVbmRlZmluZWQpCi0gICAgICAgIHBh cnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1ZhbHVlID0ganNVbmRlZmluZWQo KTsKLSAgICBlbHNlIHsKLSAgICAgICAgcGFydGlhbFN0cmluZ01lbWJlcldpdGhFbmFibGVkQnlT ZXR0aW5nVmFsdWUgPSBvYmplY3QtPmdldCgmbGV4aWNhbEdsb2JhbE9iamVjdCwgSWRlbnRpZmll cjo6ZnJvbVN0cmluZyh2bSwgInBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGlu ZyIpKTsKLSAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB7IH0pOwotICAg IH0KLSAgICBpZiAoIXBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1ZhbHVl LmlzVW5kZWZpbmVkKCkpIHsKLSAgICAgICAgcmVzdWx0LnBhcnRpYWxTdHJpbmdNZW1iZXJXaXRo RW5hYmxlZEJ5U2V0dGluZyA9IGNvbnZlcnQ8SURMRE9NU3RyaW5nPihsZXhpY2FsR2xvYmFsT2Jq ZWN0LCBwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmdWYWx1ZSk7Ci0gICAg ICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgeyB9KTsKKyAgICBpZiAoanNDYXN0 PEpTRE9NR2xvYmFsT2JqZWN0Kj4oJmdsb2JhbE9iamVjdCktPnNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQoKS0+c2V0dGluZ3NWYWx1ZXMoKS50ZXN0U2V0dGluZ0VuYWJsZWQpIHsKKyAgICAgICAgSlNW YWx1ZSBwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmdWYWx1ZTsKKyAgICAg ICAgaWYgKGlzTnVsbE9yVW5kZWZpbmVkKQorICAgICAgICAgICAgcGFydGlhbFN0cmluZ01lbWJl cldpdGhFbmFibGVkQnlTZXR0aW5nVmFsdWUgPSBqc1VuZGVmaW5lZCgpOworICAgICAgICBlbHNl IHsKKyAgICAgICAgICAgIHBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1Zh bHVlID0gb2JqZWN0LT5nZXQoJmxleGljYWxHbG9iYWxPYmplY3QsIElkZW50aWZpZXI6OmZyb21T dHJpbmcodm0sICJwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmciKSk7Cisg ICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIHsgfSk7CisgICAgICAg IH0KKyAgICAgICAgaWYgKCFwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmdW YWx1ZS5pc1VuZGVmaW5lZCgpKSB7CisgICAgICAgICAgICByZXN1bHQucGFydGlhbFN0cmluZ01l bWJlcldpdGhFbmFibGVkQnlTZXR0aW5nID0gY29udmVydDxJRExET01TdHJpbmc+KGxleGljYWxH bG9iYWxPYmplY3QsIHBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1ZhbHVl KTsKKyAgICAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgeyB9KTsKKyAg ICAgICAgfQogICAgIH0KICAgICBKU1ZhbHVlIHBhcnRpYWxVbnNpZ25lZExvbmdNZW1iZXJXaXRo SW1wbGVtZW50ZWRBc1ZhbHVlOwogICAgIGlmIChpc051bGxPclVuZGVmaW5lZCkKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RTdGFuZGFsb25lRGlj dGlvbmFyeS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0 cy90ZXN0L0pTL0pTVGVzdFN0YW5kYWxvbmVEaWN0aW9uYXJ5LmNwcAkocmV2aXNpb24gMjc2ODE5 KQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdFN0YW5k YWxvbmVEaWN0aW9uYXJ5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTgzLDE2ICsxODMsMTggQEAg dGVtcGxhdGU8PiBEaWN0aW9uYXJ5SW1wbE5hbWUgY29udmVydERpYwogICAgIH0KICNlbmRpZgog I2lmIEVOQUJMRShDb25kaXRpb25hbDEzKSB8fCBFTkFCTEUoQ29uZGl0aW9uYWwxNCkKLSAgICBK U1ZhbHVlIHBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1ZhbHVlOwotICAg IGlmIChpc051bGxPclVuZGVmaW5lZCkKLSAgICAgICAgcGFydGlhbFN0cmluZ01lbWJlcldpdGhF bmFibGVkQnlTZXR0aW5nVmFsdWUgPSBqc1VuZGVmaW5lZCgpOwotICAgIGVsc2UgewotICAgICAg ICBwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmdWYWx1ZSA9IG9iamVjdC0+ Z2V0KCZsZXhpY2FsR2xvYmFsT2JqZWN0LCBJZGVudGlmaWVyOjpmcm9tU3RyaW5nKHZtLCAicGFy dGlhbFN0cmluZ01lbWJlcldpdGhFbmFibGVkQnlTZXR0aW5nIikpOwotICAgICAgICBSRVRVUk5f SUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIHsgfSk7Ci0gICAgfQotICAgIGlmICghcGFydGlhbFN0 cmluZ01lbWJlcldpdGhFbmFibGVkQnlTZXR0aW5nVmFsdWUuaXNVbmRlZmluZWQoKSkgewotICAg ICAgICByZXN1bHQucGFydGlhbFN0cmluZ01lbWJlcldpdGhFbmFibGVkQnlTZXR0aW5nID0gY29u dmVydDxJRExET01TdHJpbmc+KGxleGljYWxHbG9iYWxPYmplY3QsIHBhcnRpYWxTdHJpbmdNZW1i ZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1ZhbHVlKTsKLSAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElP Tih0aHJvd1Njb3BlLCB7IH0pOworICAgIGlmIChqc0Nhc3Q8SlNET01HbG9iYWxPYmplY3QqPigm Z2xvYmFsT2JqZWN0KS0+c2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT5zZXR0aW5nc1ZhbHVlcygp LnRlc3RTZXR0aW5nRW5hYmxlZCkgeworICAgICAgICBKU1ZhbHVlIHBhcnRpYWxTdHJpbmdNZW1i ZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1ZhbHVlOworICAgICAgICBpZiAoaXNOdWxsT3JVbmRlZmlu ZWQpCisgICAgICAgICAgICBwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmdW YWx1ZSA9IGpzVW5kZWZpbmVkKCk7CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAgcGFydGlh bFN0cmluZ01lbWJlcldpdGhFbmFibGVkQnlTZXR0aW5nVmFsdWUgPSBvYmplY3QtPmdldCgmbGV4 aWNhbEdsb2JhbE9iamVjdCwgSWRlbnRpZmllcjo6ZnJvbVN0cmluZyh2bSwgInBhcnRpYWxTdHJp bmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZyIpKTsKKyAgICAgICAgICAgIFJFVFVSTl9JRl9F WENFUFRJT04odGhyb3dTY29wZSwgeyB9KTsKKyAgICAgICAgfQorICAgICAgICBpZiAoIXBhcnRp YWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1ZhbHVlLmlzVW5kZWZpbmVkKCkpIHsK KyAgICAgICAgICAgIHJlc3VsdC5wYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRp bmcgPSBjb252ZXJ0PElETERPTVN0cmluZz4obGV4aWNhbEdsb2JhbE9iamVjdCwgcGFydGlhbFN0 cmluZ01lbWJlcldpdGhFbmFibGVkQnlTZXR0aW5nVmFsdWUpOworICAgICAgICAgICAgUkVUVVJO X0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB7IH0pOworICAgICAgICB9CiAgICAgfQogI2VuZGlm CiAjaWYgRU5BQkxFKENvbmRpdGlvbmFsMTMpIHx8IEVOQUJMRShDb25kaXRpb25hbDE0KQo= 427502 2021-05-01 09:34:10 -0700 2021-05-01 10:15:10 -0700 Patch bug-225271-20210501093409.patch text/plain 14509 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI3Njg3MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA1LTAxICBTYW0gV2Vp bmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBHZW5lcmF0ZWQgSlMgYmluZGluZ3Mg Zm9yIEpTVmFsdWUgLT4gSURMIGRpY3Rpb25hcnkgZG9uJ3QgdGFrZSBpbnRvIGFjY291bnQgcnVu dGltZSBzZXR0aW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjI1MjcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV2hpbGUgd2UgZGlkIGFjY291bnQgZm9yIFNldHRpbmdzL1J1bnRpbWVFbmFibGVkRmVh dHVyZXMvZXRjIHdoZW4gY29udmVydGluZyBmcm9tIGEKKyAgICAgICAgZGljdGlvbmFyeSB0byBh IEpTVmFsdWUsIHdlIGZvcmdvdCB0byBhZGQgY29kZSB0byBza2lwIHRyeWluZyB0byByZWFkIHRo ZSBwcm9wZXJ0aWVzCisgICAgICAgIGluIG9uIGluZ2VzdGlvbi4KKworICAgICAgICAqIGJpbmRp bmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtOgorICAgICAgICAoR2VuZXJhdGVEaWN0aW9u YXJ5SW1wbGVtZW50YXRpb25Db250ZW50KToKKyAgICAgICAgTWF0Y2ggY29udmVydERpY3Rpb25h cnlUb0pTIGFuZCBhZGQgZ3VhcmQgKyBpbmRlbnQgaWYgdGhlIHByb3BlcnR5IGhhcyBhIHJ1bnRp bWUgZmxhZy4KKworICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3REZXJp dmVkRGljdGlvbmFyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb252ZXJ0RGljdGlvbmFyeTxU ZXN0RGVyaXZlZERpY3Rpb25hcnk+KToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3Qv SlMvSlNUZXN0RGVyaXZlZERpY3Rpb25hcnkyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvbnZl cnREaWN0aW9uYXJ5PFRlc3REZXJpdmVkRGljdGlvbmFyeTI6OkRpY3Rpb25hcnk+KToKKyAgICAg ICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0SW5oZXJpdGVkRGljdGlvbmFyeS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpjb252ZXJ0RGljdGlvbmFyeTxUZXN0SW5oZXJpdGVkRGlj dGlvbmFyeT4pOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RTdGFu ZGFsb25lRGljdGlvbmFyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb252ZXJ0RGljdGlvbmFy eTxEaWN0aW9uYXJ5SW1wbE5hbWU+KToKKyAgICAgICAgVXBkYXRlIHRlc3QgcmVzdWx0cy4KKwog MjAyMS0wNS0wMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtS ZW5kZXJUcmVlQnVpbGRlcl0gUmVzZXQgdGhlICJjaGlsZHJlbiBpbmxpbmUiIHN0YXRlIHdoZW4g bWVyZ2luZyBhbm9ueW1vdXMgdGFibGUgYm94ZXMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtCShyZXZpc2lvbiAyNzY4MTkp CisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQko d29ya2luZyBjb3B5KQpAQCAtMjYyMCw0MCArMjYyMCw1MiBAQCBzdWIgR2VuZXJhdGVEaWN0aW9u YXJ5SW1wbGVtZW50YXRpb25Db250CiAgICAgICAgICAgICAgICAgJHJlc3VsdCAuPSAiI2lmICR7 Y29uZGl0aW9uYWxTdHJpbmd9XG4iOwogICAgICAgICAgICAgfQogCisgICAgICAgICAgICBteSAk bmVlZHNSdW50aW1lQ2hlY2sgPSBOZWVkc1J1bnRpbWVDaGVjaygkZGljdGlvbmFyeSwgJG1lbWJl cik7CisgICAgICAgICAgICBteSAkaW5kZW50ID0gIiI7CisgICAgICAgICAgICBpZiAoJG5lZWRz UnVudGltZUNoZWNrKSB7CisgICAgICAgICAgICAgICAgbXkgJHJ1bnRpbWVFbmFibGVDb25kaXRp b25hbFN0cmluZyA9IEdlbmVyYXRlUnVudGltZUVuYWJsZUNvbmRpdGlvbmFsU3RyaW5nKCRkaWN0 aW9uYXJ5LCAkbWVtYmVyLCAiJmxleGljYWxHbG9iYWxPYmplY3QiKTsKKyAgICAgICAgICAgICAg ICAkcmVzdWx0IC49ICIgICAgaWYgKCR7cnVudGltZUVuYWJsZUNvbmRpdGlvbmFsU3RyaW5nfSkg e1xuIjsKKyAgICAgICAgICAgICAgICAkaW5kZW50ID0gIiAgICAiOworICAgICAgICAgICAgfQor CiAgICAgICAgICAgICAjIDQuMS4gTGV0IGtleSBiZSB0aGUgaWRlbnRpZmllciBvZiBtZW1iZXIu CiAgICAgICAgICAgICBteSAka2V5ID0gJG1lbWJlci0+bmFtZTsKICAgICAgICAgICAgIG15ICRp bXBsZW1lbnRlZEFzS2V5ID0gJG1lbWJlci0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57SW1wbGVtZW50 ZWRBc30gfHwgJGtleTsKIAogICAgICAgICAgICAgIyA0LjIuIExldCB2YWx1ZSBiZSBhbiBFQ01B U2NyaXB0IHZhbHVlLCBkZXBlbmRpbmcgb24gVHlwZShWKToKLSAgICAgICAgICAgICRyZXN1bHQg Lj0gIiAgICBKU1ZhbHVlICR7a2V5fVZhbHVlO1xuIjsKLSAgICAgICAgICAgICRyZXN1bHQgLj0g IiAgICBpZiAoaXNOdWxsT3JVbmRlZmluZWQpXG4iOwotICAgICAgICAgICAgJHJlc3VsdCAuPSAi ICAgICAgICAke2tleX1WYWx1ZSA9IGpzVW5kZWZpbmVkKCk7XG4iOwotICAgICAgICAgICAgJHJl c3VsdCAuPSAiICAgIGVsc2Uge1xuIjsKLSAgICAgICAgICAgICRyZXN1bHQgLj0gIiAgICAgICAg JHtrZXl9VmFsdWUgPSBvYmplY3QtPmdldCgmbGV4aWNhbEdsb2JhbE9iamVjdCwgSWRlbnRpZmll cjo6ZnJvbVN0cmluZyh2bSwgXCIke2tleX1cIikpO1xuIjsKLSAgICAgICAgICAgICRyZXN1bHQg Lj0gIiAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB7IH0pO1xuIjsKLSAg ICAgICAgICAgICRyZXN1bHQgLj0gIiAgICB9XG4iOworICAgICAgICAgICAgJHJlc3VsdCAuPSAi JHtpbmRlbnR9ICAgIEpTVmFsdWUgJHtrZXl9VmFsdWU7XG4iOworICAgICAgICAgICAgJHJlc3Vs dCAuPSAiJHtpbmRlbnR9ICAgIGlmIChpc051bGxPclVuZGVmaW5lZClcbiI7CisgICAgICAgICAg ICAkcmVzdWx0IC49ICIke2luZGVudH0gICAgICAgICR7a2V5fVZhbHVlID0ganNVbmRlZmluZWQo KTtcbiI7CisgICAgICAgICAgICAkcmVzdWx0IC49ICIke2luZGVudH0gICAgZWxzZSB7XG4iOwor ICAgICAgICAgICAgJHJlc3VsdCAuPSAiJHtpbmRlbnR9ICAgICAgICAke2tleX1WYWx1ZSA9IG9i amVjdC0+Z2V0KCZsZXhpY2FsR2xvYmFsT2JqZWN0LCBJZGVudGlmaWVyOjpmcm9tU3RyaW5nKHZt LCBcIiR7a2V5fVwiKSk7XG4iOworICAgICAgICAgICAgJHJlc3VsdCAuPSAiJHtpbmRlbnR9ICAg ICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIHsgfSk7XG4iOworICAgICAgICAg ICAgJHJlc3VsdCAuPSAiJHtpbmRlbnR9ICAgIH1cbiI7CiAKICAgICAgICAgICAgIG15ICRJRExU eXBlID0gR2V0SURMVHlwZSgkdHlwZVNjb3BlLCAkdHlwZSk7CiAKICAgICAgICAgICAgICMgNC4z LiBJZiB2YWx1ZSBpcyBub3QgdW5kZWZpbmVkLCB0aGVuOgotICAgICAgICAgICAgJHJlc3VsdCAu PSAiICAgIGlmICghJHtrZXl9VmFsdWUuaXNVbmRlZmluZWQoKSkge1xuIjsKKyAgICAgICAgICAg ICRyZXN1bHQgLj0gIiR7aW5kZW50fSAgICBpZiAoISR7a2V5fVZhbHVlLmlzVW5kZWZpbmVkKCkp IHtcbiI7CiAKICAgICAgICAgICAgIG15ICRuYXRpdmVWYWx1ZSA9IEpTVmFsdWVUb05hdGl2ZSgk dHlwZVNjb3BlLCAkbWVtYmVyLCAiJHtrZXl9VmFsdWUiLCAkbWVtYmVyLT5leHRlbmRlZEF0dHJp YnV0ZXMtPntDb25kaXRpb25hbH0sICImbGV4aWNhbEdsb2JhbE9iamVjdCIsICJsZXhpY2FsR2xv YmFsT2JqZWN0IiwgIiIsICIqanNDYXN0PEpTRE9NR2xvYmFsT2JqZWN0Kj4oJmxleGljYWxHbG9i YWxPYmplY3QpIik7Ci0gICAgICAgICAgICAkcmVzdWx0IC49ICIgICAgICAgIHJlc3VsdC4kaW1w bGVtZW50ZWRBc0tleSA9ICRuYXRpdmVWYWx1ZTtcbiI7Ci0gICAgICAgICAgICAkcmVzdWx0IC49 ICIgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgeyB9KTtcbiI7CisgICAg ICAgICAgICAkcmVzdWx0IC49ICIke2luZGVudH0gICAgICAgIHJlc3VsdC4kaW1wbGVtZW50ZWRB c0tleSA9ICRuYXRpdmVWYWx1ZTtcbiI7CisgICAgICAgICAgICAkcmVzdWx0IC49ICIke2luZGVu dH0gICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgeyB9KTtcbiI7CiAKICAg ICAgICAgICAgICMgVmFsdWUgaXMgdW5kZWZpbmVkLgogICAgICAgICAgICAgIyA0LjQuIE90aGVy d2lzZSwgaWYgdmFsdWUgaXMgdW5kZWZpbmVkIGJ1dCB0aGUgZGljdGlvbmFyeSBtZW1iZXIgaGFz IGEgZGVmYXVsdCB2YWx1ZSwgdGhlbjoKICAgICAgICAgICAgIGlmICghJG1lbWJlci0+aXNSZXF1 aXJlZCAmJiBkZWZpbmVkICRtZW1iZXItPmRlZmF1bHQpIHsKLSAgICAgICAgICAgICAgICAkcmVz dWx0IC49ICIgICAgfSBlbHNlXG4iOwotICAgICAgICAgICAgICAgICRyZXN1bHQgLj0gIiAgICAg ICAgcmVzdWx0LiRpbXBsZW1lbnRlZEFzS2V5ID0gIiAuIEdlbmVyYXRlRGVmYXVsdFZhbHVlKCR0 eXBlU2NvcGUsICRtZW1iZXIsICRtZW1iZXItPnR5cGUsICRtZW1iZXItPmRlZmF1bHQpIC4gIjtc biI7CisgICAgICAgICAgICAgICAgJHJlc3VsdCAuPSAiJHtpbmRlbnR9ICAgIH0gZWxzZVxuIjsK KyAgICAgICAgICAgICAgICAkcmVzdWx0IC49ICIke2luZGVudH0gICAgICAgIHJlc3VsdC4kaW1w bGVtZW50ZWRBc0tleSA9ICIgLiBHZW5lcmF0ZURlZmF1bHRWYWx1ZSgkdHlwZVNjb3BlLCAkbWVt YmVyLCAkbWVtYmVyLT50eXBlLCAkbWVtYmVyLT5kZWZhdWx0KSAuICI7XG4iOwogICAgICAgICAg ICAgfSBlbHNpZiAoJG1lbWJlci0+aXNSZXF1aXJlZCkgewogICAgICAgICAgICAgICAgICMgNC41 LiBPdGhlcndpc2UsIGlmIHZhbHVlIGlzIHVuZGVmaW5lZCBhbmQgdGhlIGRpY3Rpb25hcnkgbWVt YmVyIGlzIGEgcmVxdWlyZWQgZGljdGlvbmFyeSBtZW1iZXIsIHRoZW4gdGhyb3cgYSBUeXBlRXJy b3IuCi0gICAgICAgICAgICAgICAgJHJlc3VsdCAuPSAiICAgIH0gZWxzZSB7XG4iOwotICAgICAg ICAgICAgICAgICRyZXN1bHQgLj0gIiAgICAgICAgdGhyb3dSZXF1aXJlZE1lbWJlclR5cGVFcnJv cihsZXhpY2FsR2xvYmFsT2JqZWN0LCB0aHJvd1Njb3BlLCBcIiIuICRtZW1iZXItPm5hbWUgLiJc IiwgXCIkbmFtZVwiLCBcIiIuIEdldFR5cGVOYW1lRm9yRGlzcGxheUluRXhjZXB0aW9uKCR0eXBl KSAuIlwiKTtcbiI7Ci0gICAgICAgICAgICAgICAgJHJlc3VsdCAuPSAiICAgICAgICByZXR1cm4g eyB9O1xuIjsKLSAgICAgICAgICAgICAgICAkcmVzdWx0IC49ICIgICAgfVxuIjsKKyAgICAgICAg ICAgICAgICAkcmVzdWx0IC49ICIke2luZGVudH0gICAgfSBlbHNlIHtcbiI7CisgICAgICAgICAg ICAgICAgJHJlc3VsdCAuPSAiJHtpbmRlbnR9ICAgICAgICB0aHJvd1JlcXVpcmVkTWVtYmVyVHlw ZUVycm9yKGxleGljYWxHbG9iYWxPYmplY3QsIHRocm93U2NvcGUsIFwiIi4gJG1lbWJlci0+bmFt ZSAuIlwiLCBcIiRuYW1lXCIsIFwiIi4gR2V0VHlwZU5hbWVGb3JEaXNwbGF5SW5FeGNlcHRpb24o JHR5cGUpIC4iXCIpO1xuIjsKKyAgICAgICAgICAgICAgICAkcmVzdWx0IC49ICIke2luZGVudH0g ICAgICAgIHJldHVybiB7IH07XG4iOworICAgICAgICAgICAgICAgICRyZXN1bHQgLj0gIiR7aW5k ZW50fSAgICB9XG4iOwogICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAkcmVz dWx0IC49ICIke2luZGVudH0gICAgfVxuIjsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAg aWYgKCRuZWVkc1J1bnRpbWVDaGVjaykgewogICAgICAgICAgICAgICAgICRyZXN1bHQgLj0gIiAg ICB9XG4iOwogICAgICAgICAgICAgfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL3Rlc3QvSlMvSlNUZXN0RGVyaXZlZERpY3Rpb25hcnkyLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0RGVyaXZlZERp Y3Rpb25hcnkyLmNwcAkocmV2aXNpb24gMjc2ODE5KQorKysgU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdERlcml2ZWREaWN0aW9uYXJ5Mi5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTIxMSwxNiArMjExLDE4IEBAIHRlbXBsYXRlPD4gVGVzdERlcml2ZWREaWN0aW9u YXJ5Mjo6RGljdGkKICAgICAgICAgcmVzdWx0LnBhcnRpYWxTdHJpbmdNZW1iZXIgPSBjb252ZXJ0 PElETERPTVN0cmluZz4obGV4aWNhbEdsb2JhbE9iamVjdCwgcGFydGlhbFN0cmluZ01lbWJlclZh bHVlKTsKICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB7IH0pOwogICAg IH0KLSAgICBKU1ZhbHVlIHBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1Zh bHVlOwotICAgIGlmIChpc051bGxPclVuZGVmaW5lZCkKLSAgICAgICAgcGFydGlhbFN0cmluZ01l bWJlcldpdGhFbmFibGVkQnlTZXR0aW5nVmFsdWUgPSBqc1VuZGVmaW5lZCgpOwotICAgIGVsc2Ug ewotICAgICAgICBwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmdWYWx1ZSA9 IG9iamVjdC0+Z2V0KCZsZXhpY2FsR2xvYmFsT2JqZWN0LCBJZGVudGlmaWVyOjpmcm9tU3RyaW5n KHZtLCAicGFydGlhbFN0cmluZ01lbWJlcldpdGhFbmFibGVkQnlTZXR0aW5nIikpOwotICAgICAg ICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIHsgfSk7Ci0gICAgfQotICAgIGlmICgh cGFydGlhbFN0cmluZ01lbWJlcldpdGhFbmFibGVkQnlTZXR0aW5nVmFsdWUuaXNVbmRlZmluZWQo KSkgewotICAgICAgICByZXN1bHQucGFydGlhbFN0cmluZ01lbWJlcldpdGhFbmFibGVkQnlTZXR0 aW5nID0gY29udmVydDxJRExET01TdHJpbmc+KGxleGljYWxHbG9iYWxPYmplY3QsIHBhcnRpYWxT dHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1ZhbHVlKTsKLSAgICAgICAgUkVUVVJOX0lG X0VYQ0VQVElPTih0aHJvd1Njb3BlLCB7IH0pOworICAgIGlmIChqc0Nhc3Q8SlNET01HbG9iYWxP YmplY3QqPigmbGV4aWNhbEdsb2JhbE9iamVjdCktPnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+ c2V0dGluZ3NWYWx1ZXMoKS50ZXN0U2V0dGluZ0VuYWJsZWQpIHsKKyAgICAgICAgSlNWYWx1ZSBw YXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmdWYWx1ZTsKKyAgICAgICAgaWYg KGlzTnVsbE9yVW5kZWZpbmVkKQorICAgICAgICAgICAgcGFydGlhbFN0cmluZ01lbWJlcldpdGhF bmFibGVkQnlTZXR0aW5nVmFsdWUgPSBqc1VuZGVmaW5lZCgpOworICAgICAgICBlbHNlIHsKKyAg ICAgICAgICAgIHBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1ZhbHVlID0g b2JqZWN0LT5nZXQoJmxleGljYWxHbG9iYWxPYmplY3QsIElkZW50aWZpZXI6OmZyb21TdHJpbmco dm0sICJwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmciKSk7CisgICAgICAg ICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIHsgfSk7CisgICAgICAgIH0KKyAg ICAgICAgaWYgKCFwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmdWYWx1ZS5p c1VuZGVmaW5lZCgpKSB7CisgICAgICAgICAgICByZXN1bHQucGFydGlhbFN0cmluZ01lbWJlcldp dGhFbmFibGVkQnlTZXR0aW5nID0gY29udmVydDxJRExET01TdHJpbmc+KGxleGljYWxHbG9iYWxP YmplY3QsIHBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1ZhbHVlKTsKKyAg ICAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgeyB9KTsKKyAgICAgICAg fQogICAgIH0KICAgICBKU1ZhbHVlIHBhcnRpYWxVbnNpZ25lZExvbmdNZW1iZXJXaXRoSW1wbGVt ZW50ZWRBc1ZhbHVlOwogICAgIGlmIChpc051bGxPclVuZGVmaW5lZCkKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3REZXJpdmVkRGljdGlvbmFyeS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pT L0pTVGVzdERlcml2ZWREaWN0aW9uYXJ5LmNwcAkocmV2aXNpb24gMjc2ODE5KQorKysgU291cmNl L1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdERlcml2ZWREaWN0aW9uYXJ5 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI4LDE2ICsxMjgsMTggQEAgdGVtcGxhdGU8PiBUZXN0 RGVyaXZlZERpY3Rpb25hcnkgY29udmVydAogICAgICAgICByZXN1bHQucGFydGlhbFN0cmluZ01l bWJlciA9IGNvbnZlcnQ8SURMRE9NU3RyaW5nPihsZXhpY2FsR2xvYmFsT2JqZWN0LCBwYXJ0aWFs U3RyaW5nTWVtYmVyVmFsdWUpOwogICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2Nv cGUsIHsgfSk7CiAgICAgfQotICAgIEpTVmFsdWUgcGFydGlhbFN0cmluZ01lbWJlcldpdGhFbmFi bGVkQnlTZXR0aW5nVmFsdWU7Ci0gICAgaWYgKGlzTnVsbE9yVW5kZWZpbmVkKQotICAgICAgICBw YXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmdWYWx1ZSA9IGpzVW5kZWZpbmVk KCk7Ci0gICAgZWxzZSB7Ci0gICAgICAgIHBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5 U2V0dGluZ1ZhbHVlID0gb2JqZWN0LT5nZXQoJmxleGljYWxHbG9iYWxPYmplY3QsIElkZW50aWZp ZXI6OmZyb21TdHJpbmcodm0sICJwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRp bmciKSk7Ci0gICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgeyB9KTsKLSAg ICB9Ci0gICAgaWYgKCFwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmdWYWx1 ZS5pc1VuZGVmaW5lZCgpKSB7Ci0gICAgICAgIHJlc3VsdC5wYXJ0aWFsU3RyaW5nTWVtYmVyV2l0 aEVuYWJsZWRCeVNldHRpbmcgPSBjb252ZXJ0PElETERPTVN0cmluZz4obGV4aWNhbEdsb2JhbE9i amVjdCwgcGFydGlhbFN0cmluZ01lbWJlcldpdGhFbmFibGVkQnlTZXR0aW5nVmFsdWUpOwotICAg ICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2NvcGUsIHsgfSk7CisgICAgaWYgKGpzQ2Fz dDxKU0RPTUdsb2JhbE9iamVjdCo+KCZsZXhpY2FsR2xvYmFsT2JqZWN0KS0+c2NyaXB0RXhlY3V0 aW9uQ29udGV4dCgpLT5zZXR0aW5nc1ZhbHVlcygpLnRlc3RTZXR0aW5nRW5hYmxlZCkgeworICAg ICAgICBKU1ZhbHVlIHBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1ZhbHVl OworICAgICAgICBpZiAoaXNOdWxsT3JVbmRlZmluZWQpCisgICAgICAgICAgICBwYXJ0aWFsU3Ry aW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmdWYWx1ZSA9IGpzVW5kZWZpbmVkKCk7CisgICAg ICAgIGVsc2UgeworICAgICAgICAgICAgcGFydGlhbFN0cmluZ01lbWJlcldpdGhFbmFibGVkQnlT ZXR0aW5nVmFsdWUgPSBvYmplY3QtPmdldCgmbGV4aWNhbEdsb2JhbE9iamVjdCwgSWRlbnRpZmll cjo6ZnJvbVN0cmluZyh2bSwgInBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGlu ZyIpKTsKKyAgICAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgeyB9KTsK KyAgICAgICAgfQorICAgICAgICBpZiAoIXBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5 U2V0dGluZ1ZhbHVlLmlzVW5kZWZpbmVkKCkpIHsKKyAgICAgICAgICAgIHJlc3VsdC5wYXJ0aWFs U3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmcgPSBjb252ZXJ0PElETERPTVN0cmluZz4o bGV4aWNhbEdsb2JhbE9iamVjdCwgcGFydGlhbFN0cmluZ01lbWJlcldpdGhFbmFibGVkQnlTZXR0 aW5nVmFsdWUpOworICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB7 IH0pOworICAgICAgICB9CiAgICAgfQogICAgIEpTVmFsdWUgcGFydGlhbFVuc2lnbmVkTG9uZ01l bWJlcldpdGhJbXBsZW1lbnRlZEFzVmFsdWU7CiAgICAgaWYgKGlzTnVsbE9yVW5kZWZpbmVkKQpJ bmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdEluaGVy aXRlZERpY3Rpb25hcnkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RJbmhlcml0ZWREaWN0aW9uYXJ5LmNwcAkocmV2aXNpb24g Mjc2ODE5KQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVz dEluaGVyaXRlZERpY3Rpb25hcnkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjgsMTYgKzEyOCwx OCBAQCB0ZW1wbGF0ZTw+IFRlc3RJbmhlcml0ZWREaWN0aW9uYXJ5IGNvbnZlCiAgICAgICAgIHJl c3VsdC5wYXJ0aWFsU3RyaW5nTWVtYmVyID0gY29udmVydDxJRExET01TdHJpbmc+KGxleGljYWxH bG9iYWxPYmplY3QsIHBhcnRpYWxTdHJpbmdNZW1iZXJWYWx1ZSk7CiAgICAgICAgIFJFVFVSTl9J Rl9FWENFUFRJT04odGhyb3dTY29wZSwgeyB9KTsKICAgICB9Ci0gICAgSlNWYWx1ZSBwYXJ0aWFs U3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmdWYWx1ZTsKLSAgICBpZiAoaXNOdWxsT3JV bmRlZmluZWQpCi0gICAgICAgIHBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGlu Z1ZhbHVlID0ganNVbmRlZmluZWQoKTsKLSAgICBlbHNlIHsKLSAgICAgICAgcGFydGlhbFN0cmlu Z01lbWJlcldpdGhFbmFibGVkQnlTZXR0aW5nVmFsdWUgPSBvYmplY3QtPmdldCgmbGV4aWNhbEds b2JhbE9iamVjdCwgSWRlbnRpZmllcjo6ZnJvbVN0cmluZyh2bSwgInBhcnRpYWxTdHJpbmdNZW1i ZXJXaXRoRW5hYmxlZEJ5U2V0dGluZyIpKTsKLSAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0 aHJvd1Njb3BlLCB7IH0pOwotICAgIH0KLSAgICBpZiAoIXBhcnRpYWxTdHJpbmdNZW1iZXJXaXRo RW5hYmxlZEJ5U2V0dGluZ1ZhbHVlLmlzVW5kZWZpbmVkKCkpIHsKLSAgICAgICAgcmVzdWx0LnBh cnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZyA9IGNvbnZlcnQ8SURMRE9NU3Ry aW5nPihsZXhpY2FsR2xvYmFsT2JqZWN0LCBwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRC eVNldHRpbmdWYWx1ZSk7Ci0gICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwg eyB9KTsKKyAgICBpZiAoanNDYXN0PEpTRE9NR2xvYmFsT2JqZWN0Kj4oJmxleGljYWxHbG9iYWxP YmplY3QpLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPnNldHRpbmdzVmFsdWVzKCkudGVzdFNl dHRpbmdFbmFibGVkKSB7CisgICAgICAgIEpTVmFsdWUgcGFydGlhbFN0cmluZ01lbWJlcldpdGhF bmFibGVkQnlTZXR0aW5nVmFsdWU7CisgICAgICAgIGlmIChpc051bGxPclVuZGVmaW5lZCkKKyAg ICAgICAgICAgIHBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1ZhbHVlID0g anNVbmRlZmluZWQoKTsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICBwYXJ0aWFsU3RyaW5n TWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmdWYWx1ZSA9IG9iamVjdC0+Z2V0KCZsZXhpY2FsR2xv YmFsT2JqZWN0LCBJZGVudGlmaWVyOjpmcm9tU3RyaW5nKHZtLCAicGFydGlhbFN0cmluZ01lbWJl cldpdGhFbmFibGVkQnlTZXR0aW5nIikpOworICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElP Tih0aHJvd1Njb3BlLCB7IH0pOworICAgICAgICB9CisgICAgICAgIGlmICghcGFydGlhbFN0cmlu Z01lbWJlcldpdGhFbmFibGVkQnlTZXR0aW5nVmFsdWUuaXNVbmRlZmluZWQoKSkgeworICAgICAg ICAgICAgcmVzdWx0LnBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZyA9IGNv bnZlcnQ8SURMRE9NU3RyaW5nPihsZXhpY2FsR2xvYmFsT2JqZWN0LCBwYXJ0aWFsU3RyaW5nTWVt YmVyV2l0aEVuYWJsZWRCeVNldHRpbmdWYWx1ZSk7CisgICAgICAgICAgICBSRVRVUk5fSUZfRVhD RVBUSU9OKHRocm93U2NvcGUsIHsgfSk7CisgICAgICAgIH0KICAgICB9CiAgICAgSlNWYWx1ZSBw YXJ0aWFsVW5zaWduZWRMb25nTWVtYmVyV2l0aEltcGxlbWVudGVkQXNWYWx1ZTsKICAgICBpZiAo aXNOdWxsT3JVbmRlZmluZWQpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRz L3Rlc3QvSlMvSlNUZXN0U3RhbmRhbG9uZURpY3Rpb25hcnkuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RTdGFuZGFsb25lRGlj dGlvbmFyeS5jcHAJKHJldmlzaW9uIDI3NjgxOSkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RTdGFuZGFsb25lRGljdGlvbmFyeS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTE4MywxNiArMTgzLDE4IEBAIHRlbXBsYXRlPD4gRGljdGlvbmFyeUltcGxOYW1l IGNvbnZlcnREaWMKICAgICB9CiAjZW5kaWYKICNpZiBFTkFCTEUoQ29uZGl0aW9uYWwxMykgfHwg RU5BQkxFKENvbmRpdGlvbmFsMTQpCi0gICAgSlNWYWx1ZSBwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0 aEVuYWJsZWRCeVNldHRpbmdWYWx1ZTsKLSAgICBpZiAoaXNOdWxsT3JVbmRlZmluZWQpCi0gICAg ICAgIHBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1ZhbHVlID0ganNVbmRl ZmluZWQoKTsKLSAgICBlbHNlIHsKLSAgICAgICAgcGFydGlhbFN0cmluZ01lbWJlcldpdGhFbmFi bGVkQnlTZXR0aW5nVmFsdWUgPSBvYmplY3QtPmdldCgmbGV4aWNhbEdsb2JhbE9iamVjdCwgSWRl bnRpZmllcjo6ZnJvbVN0cmluZyh2bSwgInBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5 U2V0dGluZyIpKTsKLSAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB7IH0p OwotICAgIH0KLSAgICBpZiAoIXBhcnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGlu Z1ZhbHVlLmlzVW5kZWZpbmVkKCkpIHsKLSAgICAgICAgcmVzdWx0LnBhcnRpYWxTdHJpbmdNZW1i ZXJXaXRoRW5hYmxlZEJ5U2V0dGluZyA9IGNvbnZlcnQ8SURMRE9NU3RyaW5nPihsZXhpY2FsR2xv YmFsT2JqZWN0LCBwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRCeVNldHRpbmdWYWx1ZSk7 Ci0gICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgeyB9KTsKKyAgICBpZiAo anNDYXN0PEpTRE9NR2xvYmFsT2JqZWN0Kj4oJmxleGljYWxHbG9iYWxPYmplY3QpLT5zY3JpcHRF eGVjdXRpb25Db250ZXh0KCktPnNldHRpbmdzVmFsdWVzKCkudGVzdFNldHRpbmdFbmFibGVkKSB7 CisgICAgICAgIEpTVmFsdWUgcGFydGlhbFN0cmluZ01lbWJlcldpdGhFbmFibGVkQnlTZXR0aW5n VmFsdWU7CisgICAgICAgIGlmIChpc051bGxPclVuZGVmaW5lZCkKKyAgICAgICAgICAgIHBhcnRp YWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZ1ZhbHVlID0ganNVbmRlZmluZWQoKTsK KyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICBwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJs ZWRCeVNldHRpbmdWYWx1ZSA9IG9iamVjdC0+Z2V0KCZsZXhpY2FsR2xvYmFsT2JqZWN0LCBJZGVu dGlmaWVyOjpmcm9tU3RyaW5nKHZtLCAicGFydGlhbFN0cmluZ01lbWJlcldpdGhFbmFibGVkQnlT ZXR0aW5nIikpOworICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB7 IH0pOworICAgICAgICB9CisgICAgICAgIGlmICghcGFydGlhbFN0cmluZ01lbWJlcldpdGhFbmFi bGVkQnlTZXR0aW5nVmFsdWUuaXNVbmRlZmluZWQoKSkgeworICAgICAgICAgICAgcmVzdWx0LnBh cnRpYWxTdHJpbmdNZW1iZXJXaXRoRW5hYmxlZEJ5U2V0dGluZyA9IGNvbnZlcnQ8SURMRE9NU3Ry aW5nPihsZXhpY2FsR2xvYmFsT2JqZWN0LCBwYXJ0aWFsU3RyaW5nTWVtYmVyV2l0aEVuYWJsZWRC eVNldHRpbmdWYWx1ZSk7CisgICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2Nv cGUsIHsgfSk7CisgICAgICAgIH0KICAgICB9CiAjZW5kaWYKICNpZiBFTkFCTEUoQ29uZGl0aW9u YWwxMykgfHwgRU5BQkxFKENvbmRpdGlvbmFsMTQpCg==