56950 2011-03-23 12:31:31 -0700 Fix ambiguous method call in V8 IDL generated code for DOMStringList callback parameter 2011-03-24 13:20:58 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 0 tjclose webkit-unassigned commit-queue japhet webkit.review.bot oldest_to_newest 372347 0 tjclose 2011-03-23 12:31:31 -0700 Fix ambiguous method call in V8 IDL generated code for DOMStringList callback parameter 372353 1 86669 tjclose 2011-03-23 12:33:10 -0700 Created attachment 86669 Patch 372357 2 webkit.review.bot 2011-03-23 12:36:17 -0700 Attachment 86669 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:130: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 1 in 13 files If any of these errors are false positives, please file a bug against check-webkit-style. 372363 3 86669 jorlow 2011-03-23 12:38:30 -0700 Comment on attachment 86669 Patch r=me 372389 4 86669 commit-queue 2011-03-23 13:13:38 -0700 Comment on attachment 86669 Patch Clearing flags on attachment: 86669 Committed r81799: <http://trac.webkit.org/changeset/81799> 372390 5 commit-queue 2011-03-23 13:13:42 -0700 All reviewed patches have been landed. Closing bug. 373008 6 japhet 2011-03-24 13:00:15 -0700 Is there a reason it's necessary to use a PassRefPtr<DOMStringList> in these cases, rather than a raw DOMStringList* ? Sorry for not asking before the patch landed. 373039 7 tjclose 2011-03-24 13:18:47 -0700 @japhet: I tried using the raw type DOMStringList* first. As I recall, there were a couple problems with that: v8ValueToWebCoreDOMStringList() returns a PassRefPtr, so you get another compile error in the IDL stubs. It also caused problems for some of the hand-written IDB stubs. 373041 8 japhet 2011-03-24 13:20:58 -0700 (In reply to comment #7) > @japhet: I tried using the raw type DOMStringList* first. As I recall, there were a couple problems with that: v8ValueToWebCoreDOMStringList() returns a PassRefPtr, so you get another compile error in the IDL stubs. It also caused problems for some of the hand-written IDB stubs. Ok, sounds good. Just figured I should ask, since I didn't know how DOMStringList is used well enough to have known about the v8ValueToWebCoreDOMStringList issue. 86669 2011-03-23 12:33:10 -0700 2011-03-23 13:13:38 -0700 Patch bug-56950-20110323123308.patch text/plain 12764 tjclose SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgxNzkzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMDMtMjMgIFR5bGVyIENs b3NlICA8dGpjbG9zZUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRml4IGFtYmlndW91cyBtZXRob2QgY2FsbCBpbiBWOCBJREwg Z2VuZXJhdGVkIGNvZGUgZm9yIERPTVN0cmluZ0xpc3QgY2FsbGJhY2sgcGFyYW1ldGVyCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Njk1MAorCisgICAg ICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG06CisgICAgICAgICogYmlu ZGluZ3Mvc2NyaXB0cy90ZXN0L0NQUC9XZWJET01UZXN0Q2FsbGJhY2suY3BwOgorICAgICAgICAo V2ViRE9NVGVzdENhbGxiYWNrOjpjYWxsYmFja1dpdGhTdHJpbmdMaXN0KToKKyAgICAgICAgKiBi aW5kaW5ncy9zY3JpcHRzL3Rlc3QvQ1BQL1dlYkRPTVRlc3RDYWxsYmFjay5oOgorICAgICAgICAq IGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9HT2JqZWN0L1dlYktpdERPTVRlc3RDYWxsYmFjay5jcHA6 CisgICAgICAgICh3ZWJraXRfZG9tX3Rlc3RfY2FsbGJhY2tfY2FsbGJhY2tfd2l0aF9zdHJpbmdf bGlzdCk6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0dPYmplY3QvV2ViS2l0RE9N VGVzdENhbGxiYWNrLmg6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVz dENhbGxiYWNrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpTVGVzdENhbGxiYWNrOjpjYWxsYmFj a1dpdGhTdHJpbmdMaXN0KToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNU ZXN0Q2FsbGJhY2suaDoKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvT2JqQy9ET01U ZXN0Q2FsbGJhY2suaDoKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvT2JqQy9ET01U ZXN0Q2FsbGJhY2subW06CisgICAgICAgICgtW0RPTVRlc3RDYWxsYmFjayBjYWxsYmFja1dpdGhT dHJpbmdMaXN0Ol0pOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9UZXN0Q2FsbGJh Y2suaWRsOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RDYWxsYmFj ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOFRlc3RDYWxsYmFjazo6Y2FsbGJhY2tXaXRoU3Ry aW5nTGlzdCk6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdENhbGxi YWNrLmg6CisKIDIwMTEtMDMtMjMgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgpJbmRleDog U291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgu cG0JKHJldmlzaW9uIDgxNzkxKQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9D b2RlR2VuZXJhdG9yVjgucG0JKHdvcmtpbmcgY29weSkKQEAgLTI4NDYsNiArMjg0Niw3IEBAIHN1 YiBHZXROYXRpdmVUeXBlCiAKICAgICByZXR1cm4gIlJlZlB0cjxNZWRpYVF1ZXJ5TGlzdExpc3Rl bmVyPiIgaWYgJHR5cGUgZXEgIk1lZGlhUXVlcnlMaXN0TGlzdGVuZXIiOwogCisgICAgcmV0dXJu ICJQYXNzUmVmUHRyPERPTVN0cmluZ0xpc3Q+IiBpZiAkdHlwZSBlcSAiRE9NU3RyaW5nTGlzdCIg YW5kICRpc1BhcmFtZXRlcjsKICAgICByZXR1cm4gIlJlZlB0cjxET01TdHJpbmdMaXN0PiIgaWYg JHR5cGUgZXEgIkRPTVN0cmluZ0xpc3QiOwogCiAgICAgIyBEZWZhdWx0LCBhc3N1bWUgbmF0aXZl IHR5cGUgaXMgYSBwb2ludGVyIHdpdGggc2FtZSB0eXBlIG5hbWUgYXMgaWRsIHR5cGUKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9UZXN0Q2FsbGJhY2suaWRsCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9UZXN0Q2Fs bGJhY2suaWRsCShyZXZpc2lvbiA4MTc5MSkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvdGVzdC9UZXN0Q2FsbGJhY2suaWRsCSh3b3JraW5nIGNvcHkpCkBAIC0zOCw1ICszOCw2 IEBAIG1vZHVsZSB0ZXN0IHsKICAgICAgIGJvb2xlYW4gY2FsbGJhY2tXaXRoQ2xhc3MyUGFyYW0o aW4gQ2xhc3MyIGNsYXNzMlBhcmFtLCBpbiBET01TdHJpbmcgc3RyQXJnKTsKICAgICAgIGxvbmcg Y2FsbGJhY2tXaXRoTm9uQm9vbFJldHVyblR5cGUoaW4gQ2xhc3MzIGNsYXNzM1BhcmFtKTsKICAg ICAgIFtDdXN0b21dIGxvbmcgY3VzdG9tQ2FsbGJhY2soaW4gQ2xhc3M1IGNsYXNzNVBhcmFtLCBp biBDbGFzczYgY2xhc3M2UGFyYW0pOworICAgICAgYm9vbGVhbiBjYWxsYmFja1dpdGhTdHJpbmdM aXN0KGluIERPTVN0cmluZ0xpc3QgbGlzdFBhcmFtKTsKICAgICB9OwogfQpJbmRleDogU291cmNl L1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0NQUC9XZWJET01UZXN0Q2FsbGJhY2suY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9DUFAv V2ViRE9NVGVzdENhbGxiYWNrLmNwcAkocmV2aXNpb24gODE3OTEpCisrKyBTb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvQ1BQL1dlYkRPTVRlc3RDYWxsYmFjay5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTI3LDExICsyNywxMyBAQAogI2luY2x1ZGUgIkNsYXNzMS5oIgogI2luY2x1 ZGUgIkNsYXNzMi5oIgogI2luY2x1ZGUgIkNsYXNzMy5oIgorI2luY2x1ZGUgIkRPTVN0cmluZ0xp c3QuaCIKICNpbmNsdWRlICJLVVJMLmgiCiAjaW5jbHVkZSAiVGVzdENhbGxiYWNrLmgiCiAjaW5j bHVkZSAiV2ViRE9NQ2xhc3MxLmgiCiAjaW5jbHVkZSAiV2ViRE9NQ2xhc3MyLmgiCiAjaW5jbHVk ZSAiV2ViRE9NQ2xhc3MzLmgiCisjaW5jbHVkZSAiV2ViRE9NRE9NU3RyaW5nTGlzdC5oIgogI2lu Y2x1ZGUgIldlYkRPTVN0cmluZy5oIgogI2luY2x1ZGUgIldlYkV4Y2VwdGlvbkhhbmRsZXIuaCIK ICNpbmNsdWRlICJ3dGYvdGV4dC9BdG9taWNTdHJpbmcuaCIKQEAgLTExNSw2ICsxMTcsMTQgQEAg aW50IFdlYkRPTVRlc3RDYWxsYmFjazo6Y2FsbGJhY2tXaXRoTm9uQgogICAgIHJldHVybiBpbXBs KCktPmNhbGxiYWNrV2l0aE5vbkJvb2xSZXR1cm5UeXBlKHRvV2ViQ29yZShjbGFzczNQYXJhbSkp OwogfQogCitib29sIFdlYkRPTVRlc3RDYWxsYmFjazo6Y2FsbGJhY2tXaXRoU3RyaW5nTGlzdChj b25zdCBXZWJET01ET01TdHJpbmdMaXN0JiBsaXN0UGFyYW0pCit7CisgICAgaWYgKCFpbXBsKCkp CisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVybiBpbXBsKCktPmNhbGxiYWNrV2l0 aFN0cmluZ0xpc3QodG9XZWJDb3JlKGxpc3RQYXJhbSkpOworfQorCiBXZWJDb3JlOjpUZXN0Q2Fs bGJhY2sqIHRvV2ViQ29yZShjb25zdCBXZWJET01UZXN0Q2FsbGJhY2smIHdyYXBwZXIpCiB7CiAg ICAgcmV0dXJuIHdyYXBwZXIuaW1wbCgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy90ZXN0L0NQUC9XZWJET01UZXN0Q2FsbGJhY2suaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvQ1BQL1dlYkRPTVRlc3RDYWxsYmFjay5o CShyZXZpc2lvbiA4MTc5MSkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVz dC9DUFAvV2ViRE9NVGVzdENhbGxiYWNrLmgJKHdvcmtpbmcgY29weSkKQEAgLTM3LDYgKzM3LDcg QEAgY2xhc3MgV2ViRE9NQ2xhc3MyOwogY2xhc3MgV2ViRE9NQ2xhc3MzOwogY2xhc3MgV2ViRE9N Q2xhc3M1OwogY2xhc3MgV2ViRE9NQ2xhc3M2OworY2xhc3MgV2ViRE9NRE9NU3RyaW5nTGlzdDsK IAogY2xhc3MgV2ViRE9NVGVzdENhbGxiYWNrIDogcHVibGljIFdlYkRPTU9iamVjdCB7CiBwdWJs aWM6CkBAIC01MSw2ICs1Miw3IEBAIHB1YmxpYzoKICAgICBib29sIGNhbGxiYWNrV2l0aENsYXNz MlBhcmFtKGNvbnN0IFdlYkRPTUNsYXNzMiYgY2xhc3MyUGFyYW0sIGNvbnN0IFdlYkRPTVN0cmlu ZyYgc3RyQXJnKTsKICAgICBpbnQgY2FsbGJhY2tXaXRoTm9uQm9vbFJldHVyblR5cGUoY29uc3Qg V2ViRE9NQ2xhc3MzJiBjbGFzczNQYXJhbSk7CiAgICAgaW50IGN1c3RvbUNhbGxiYWNrKGNvbnN0 IFdlYkRPTUNsYXNzNSYgY2xhc3M1UGFyYW0sIGNvbnN0IFdlYkRPTUNsYXNzNiYgY2xhc3M2UGFy YW0pOworICAgIGJvb2wgY2FsbGJhY2tXaXRoU3RyaW5nTGlzdChjb25zdCBXZWJET01ET01TdHJp bmdMaXN0JiBsaXN0UGFyYW0pOwogCiAgICAgV2ViQ29yZTo6VGVzdENhbGxiYWNrKiBpbXBsKCkg Y29uc3Q7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9HT2Jq ZWN0L1dlYktpdERPTVRlc3RDYWxsYmFjay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0dPYmplY3QvV2ViS2l0RE9NVGVzdENhbGxiYWNrLmNw cAkocmV2aXNpb24gODE3OTEpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rl c3QvR09iamVjdC9XZWJLaXRET01UZXN0Q2FsbGJhY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z Nyw2ICszNyw4IEBACiAjaW5jbHVkZSAid2Via2l0L1dlYktpdERPTUNsYXNzMlByaXZhdGUuaCIK ICNpbmNsdWRlICJ3ZWJraXQvV2ViS2l0RE9NQ2xhc3MzLmgiCiAjaW5jbHVkZSAid2Via2l0L1dl YktpdERPTUNsYXNzM1ByaXZhdGUuaCIKKyNpbmNsdWRlICJ3ZWJraXQvV2ViS2l0RE9NRE9NU3Ry aW5nTGlzdC5oIgorI2luY2x1ZGUgIndlYmtpdC9XZWJLaXRET01ET01TdHJpbmdMaXN0UHJpdmF0 ZS5oIgogI2luY2x1ZGUgIndlYmtpdC9XZWJLaXRET01UZXN0Q2FsbGJhY2suaCIKICNpbmNsdWRl ICJ3ZWJraXQvV2ViS2l0RE9NVGVzdENhbGxiYWNrUHJpdmF0ZS5oIgogI2luY2x1ZGUgIndlYmtp dGRlZmluZXMuaCIKQEAgLTExNyw2ICsxMTksMjIgQEAgd2Via2l0X2RvbV90ZXN0X2NhbGxiYWNr X2NhbGxiYWNrX3dpdGhfbgogICAgIHJldHVybiByZXM7CiB9CiAKK2dib29sZWFuCit3ZWJraXRf ZG9tX3Rlc3RfY2FsbGJhY2tfY2FsbGJhY2tfd2l0aF9zdHJpbmdfbGlzdChXZWJLaXRET01UZXN0 Q2FsbGJhY2sqIHNlbGYsIFdlYktpdERPTURPTVN0cmluZ0xpc3QqIGxpc3RfcGFyYW0pCit7Cisg ICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoc2VsZiwgMCk7CisgICAgV2ViQ29yZTo6SlNNYWluVGhy ZWFkTnVsbFN0YXRlIHN0YXRlOworICAgIFdlYkNvcmU6OlRlc3RDYWxsYmFjayAqIGl0ZW0gPSBX ZWJLaXQ6OmNvcmUoc2VsZik7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwobGlzdF9wYXJhbSwg MCk7CisgICAgV2ViQ29yZTo6RE9NU3RyaW5nTGlzdCAqIGNvbnZlcnRlZF9saXN0X3BhcmFtID0g TlVMTDsKKyAgICBpZiAobGlzdF9wYXJhbSAhPSBOVUxMKSB7CisgICAgICAgIGNvbnZlcnRlZF9s aXN0X3BhcmFtID0gV2ViS2l0Ojpjb3JlKGxpc3RfcGFyYW0pOworICAgICAgICBnX3JldHVybl92 YWxfaWZfZmFpbChjb252ZXJ0ZWRfbGlzdF9wYXJhbSwgMCk7CisgICAgfQorICAgIGdib29sZWFu IHJlcyA9IGl0ZW0tPmNhbGxiYWNrV2l0aFN0cmluZ0xpc3QoY29udmVydGVkX2xpc3RfcGFyYW0p OworICAgIHJldHVybiByZXM7Cit9CisKIAogR19ERUZJTkVfVFlQRShXZWJLaXRET01UZXN0Q2Fs bGJhY2ssIHdlYmtpdF9kb21fdGVzdF9jYWxsYmFjaywgV0VCS0lUX1RZUEVfRE9NX09CSkVDVCkK IApJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0dPYmplY3QvV2Vi S2l0RE9NVGVzdENhbGxiYWNrLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy90ZXN0L0dPYmplY3QvV2ViS2l0RE9NVGVzdENhbGxiYWNrLmgJKHJldmlzaW9u IDgxNzkxKQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0dPYmplY3Qv V2ViS2l0RE9NVGVzdENhbGxiYWNrLmgJKHdvcmtpbmcgY29weSkKQEAgLTU4LDYgKzU4LDkgQEAg d2Via2l0X2RvbV90ZXN0X2NhbGxiYWNrX2NhbGxiYWNrX3dpdGhfYwogV0VCS0lUX0FQSSBnbG9u Zwogd2Via2l0X2RvbV90ZXN0X2NhbGxiYWNrX2NhbGxiYWNrX3dpdGhfbm9uX2Jvb2xfcmV0dXJu X3R5cGUoV2ViS2l0RE9NVGVzdENhbGxiYWNrKiBzZWxmLCBXZWJLaXRET01DbGFzczMqIGNsYXNz M3BhcmFtKTsKIAorV0VCS0lUX0FQSSBnYm9vbGVhbgord2Via2l0X2RvbV90ZXN0X2NhbGxiYWNr X2NhbGxiYWNrX3dpdGhfc3RyaW5nX2xpc3QoV2ViS2l0RE9NVGVzdENhbGxiYWNrKiBzZWxmLCBX ZWJLaXRET01ET01TdHJpbmdMaXN0KiBsaXN0X3BhcmFtKTsKKwogR19FTkRfREVDTFMKIAogI2Vu ZGlmIC8qIFdlYktpdERPTVRlc3RDYWxsYmFja19oICovCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0Q2FsbGJhY2suY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RDYWxsYmFjay5j cHAJKHJldmlzaW9uIDgxNzkxKQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90 ZXN0L0pTL0pTVGVzdENhbGxiYWNrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYsNiArMjYsNyBA QAogCiAjaW5jbHVkZSAiSlNDbGFzczEuaCIKICNpbmNsdWRlICJKU0NsYXNzMi5oIgorI2luY2x1 ZGUgIkpTRE9NU3RyaW5nTGlzdC5oIgogI2luY2x1ZGUgIlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQu aCIKICNpbmNsdWRlIDxydW50aW1lL0pTTG9jay5oPgogI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFk Lmg+CkBAIC0xMTAsNiArMTExLDI0IEBAIGJvb2wgSlNUZXN0Q2FsbGJhY2s6OmNhbGxiYWNrV2l0 aENsYXNzMlAKICAgICByZXR1cm4gIXJhaXNlZEV4Y2VwdGlvbjsKIH0KIAorYm9vbCBKU1Rlc3RD YWxsYmFjazo6Y2FsbGJhY2tXaXRoU3RyaW5nTGlzdChET01TdHJpbmdMaXN0KiBsaXN0UGFyYW0p Cit7CisgICAgaWYgKCFjYW5JbnZva2VDYWxsYmFjaygpKQorICAgICAgICByZXR1cm4gdHJ1ZTsK KworICAgIFJlZlB0cjxKU1Rlc3RDYWxsYmFjaz4gcHJvdGVjdCh0aGlzKTsKKworICAgIEpTTG9j ayBsb2NrKFNpbGVuY2VBc3NlcnRpb25zT25seSk7CisKKyAgICBFeGVjU3RhdGUqIGV4ZWMgPSBt X2RhdGEtPmdsb2JhbE9iamVjdCgpLT5nbG9iYWxFeGVjKCk7CisgICAgTWFya2VkQXJndW1lbnRC dWZmZXIgYXJnczsKKyAgICBhcmdzLmFwcGVuZCh0b0pTKGV4ZWMsIGxpc3RQYXJhbSkpOworCisg ICAgYm9vbCByYWlzZWRFeGNlcHRpb24gPSBmYWxzZTsKKyAgICBtX2RhdGEtPmludm9rZUNhbGxi YWNrKGFyZ3MsICZyYWlzZWRFeGNlcHRpb24pOworICAgIHJldHVybiAhcmFpc2VkRXhjZXB0aW9u OworfQorCiB9CiAKICNlbmRpZiAvLyBFTkFCTEUoREFUQUJBU0UpCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0Q2FsbGJhY2suaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0Q2FsbGJh Y2suaAkocmV2aXNpb24gODE3OTEpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRz L3Rlc3QvSlMvSlNUZXN0Q2FsbGJhY2suaAkod29ya2luZyBjb3B5KQpAQCAtNDUsNiArNDUsNyBA QCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGNhbGxiYWNrV2l0aENsYXNzMlBhcmFtKENsYXNz MiogY2xhc3MyUGFyYW0sIGNvbnN0IFN0cmluZyYgc3RyQXJnKTsKICAgICBDT01QSUxFX0FTU0VS VChmYWxzZSkgICAgdmlydHVhbCBpbnQgY2FsbGJhY2tXaXRoTm9uQm9vbFJldHVyblR5cGUoQ2xh c3MzKiBjbGFzczNQYXJhbSk7CiAgICAgdmlydHVhbCBpbnQgY3VzdG9tQ2FsbGJhY2soQ2xhc3M1 KiBjbGFzczVQYXJhbSwgQ2xhc3M2KiBjbGFzczZQYXJhbSk7CisgICAgdmlydHVhbCBib29sIGNh bGxiYWNrV2l0aFN0cmluZ0xpc3QoRE9NU3RyaW5nTGlzdCogbGlzdFBhcmFtKTsKIAogcHJpdmF0 ZToKICAgICBKU1Rlc3RDYWxsYmFjayhKU0M6OkpTT2JqZWN0KiBjYWxsYmFjaywgSlNET01HbG9i YWxPYmplY3QqKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9P YmpDL0RPTVRlc3RDYWxsYmFjay5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvdGVzdC9PYmpDL0RPTVRlc3RDYWxsYmFjay5oCShyZXZpc2lvbiA4MTc5MSkK KysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9PYmpDL0RPTVRlc3RDYWxs YmFjay5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMyw2ICszMyw3IEBACiBAY2xhc3MgRE9NQ2xhc3Mz OwogQGNsYXNzIERPTUNsYXNzNTsKIEBjbGFzcyBET01DbGFzczY7CitAY2xhc3MgRE9NRE9NU3Ry aW5nTGlzdDsKIEBjbGFzcyBOU1N0cmluZzsKIAogQGludGVyZmFjZSBET01UZXN0Q2FsbGJhY2sg OiBET01PYmplY3QKQEAgLTQxLDYgKzQyLDcgQEAKIC0gKEJPT0wpY2FsbGJhY2tXaXRoQ2xhc3My UGFyYW06KERPTUNsYXNzMiAqKWNsYXNzMlBhcmFtIHN0ckFyZzooTlNTdHJpbmcgKilzdHJBcmc7 CiAtIChpbnQpY2FsbGJhY2tXaXRoTm9uQm9vbFJldHVyblR5cGU6KERPTUNsYXNzMyAqKWNsYXNz M1BhcmFtOwogLSAoaW50KWN1c3RvbUNhbGxiYWNrOihET01DbGFzczUgKiljbGFzczVQYXJhbSBj bGFzczZQYXJhbTooRE9NQ2xhc3M2ICopY2xhc3M2UGFyYW07CistIChCT09MKWNhbGxiYWNrV2l0 aFN0cmluZ0xpc3Q6KERPTURPTVN0cmluZ0xpc3QgKilsaXN0UGFyYW07CiBAZW5kCiAKICNlbmRp ZgpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L09iakMvRE9NVGVz dENhbGxiYWNrLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvdGVzdC9PYmpDL0RPTVRlc3RDYWxsYmFjay5tbQkocmV2aXNpb24gODE3OTEpCisrKyBTb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvT2JqQy9ET01UZXN0Q2FsbGJhY2subW0J KHdvcmtpbmcgY29weSkKQEAgLTQ1LDggKzQ1LDEwIEBACiAjaW1wb3J0ICJET01DbGFzczNJbnRl cm5hbC5oIgogI2ltcG9ydCAiRE9NQ2xhc3M1SW50ZXJuYWwuaCIKICNpbXBvcnQgIkRPTUNsYXNz NkludGVybmFsLmgiCisjaW1wb3J0ICJET01ET01TdHJpbmdMaXN0SW50ZXJuYWwuaCIKICNpbXBv cnQgIkRPTUV2ZW50SW50ZXJuYWwuaCIKICNpbXBvcnQgIkRPTU5vZGVJbnRlcm5hbC5oIgorI2lt cG9ydCAiRE9NU3RyaW5nTGlzdC5oIgogI2ltcG9ydCAiRE9NU3R5bGVTaGVldEludGVybmFsLmgi CiAjaW1wb3J0ICJET01UZXN0Q2FsbGJhY2tJbnRlcm5hbC5oIgogI2ltcG9ydCAiRXhjZXB0aW9u SGFuZGxlcnMuaCIKQEAgLTEwOSw2ICsxMTEsMTIgQEAgLSAoaW50KWN1c3RvbUNhbGxiYWNrOihE T01DbGFzczUgKiljbGFzcwogICAgIHJldHVybiBJTVBMLT5jdXN0b21DYWxsYmFjayhjb3JlKGNs YXNzNVBhcmFtKSwgY29yZShjbGFzczZQYXJhbSkpOwogfQogCistIChCT09MKWNhbGxiYWNrV2l0 aFN0cmluZ0xpc3Q6KERPTURPTVN0cmluZ0xpc3QgKilsaXN0UGFyYW0KK3sKKyAgICBXZWJDb3Jl OjpKU01haW5UaHJlYWROdWxsU3RhdGUgc3RhdGU7CisgICAgcmV0dXJuIElNUEwtPmNhbGxiYWNr V2l0aFN0cmluZ0xpc3QoY29yZShsaXN0UGFyYW0pKTsKK30KKwogQGVuZAogCiBXZWJDb3JlOjpU ZXN0Q2FsbGJhY2sqIGNvcmUoRE9NVGVzdENhbGxiYWNrICp3cmFwcGVyKQpJbmRleDogU291cmNl L1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdENhbGxiYWNrLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0 Q2FsbGJhY2suY3BwCShyZXZpc2lvbiA4MTc5MSkKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RDYWxsYmFjay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI3 LDYgKzI3LDcgQEAKICNpbmNsdWRlICJWOENsYXNzMS5oIgogI2luY2x1ZGUgIlY4Q2xhc3MyLmgi CiAjaW5jbHVkZSAiVjhDdXN0b21Wb2lkQ2FsbGJhY2suaCIKKyNpbmNsdWRlICJWOERPTVN0cmlu Z0xpc3QuaCIKICNpbmNsdWRlICJWOFByb3h5LmgiCiAjaW5jbHVkZSA8d3RmL0dldFB0ci5oPgog I2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CkBAIC0xMzAsNiArMTMxLDMzIEBAIGJvb2wgVjhU ZXN0Q2FsbGJhY2s6OmNhbGxiYWNrV2l0aENsYXNzMlAKICAgICByZXR1cm4gIWludm9rZUNhbGxi YWNrKG1fY2FsbGJhY2ssIDIsIGFyZ3YsIGNhbGxiYWNrUmV0dXJuVmFsdWUsIHNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQoKSk7CiB9CiAKK2Jvb2wgVjhUZXN0Q2FsbGJhY2s6OmNhbGxiYWNrV2l0aFN0 cmluZ0xpc3QoUGFzc1JlZlB0cjxET01TdHJpbmdMaXN0PiBsaXN0UGFyYW0pCit7CisgICAgaWYg KCFjYW5JbnZva2VDYWxsYmFjaygpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIHY4OjpI YW5kbGVTY29wZSBoYW5kbGVTY29wZTsKKworICAgIHY4OjpIYW5kbGU8djg6OkNvbnRleHQ+IHY4 Q29udGV4dCA9IHRvVjhDb250ZXh0KHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwgbV93b3JsZENv bnRleHQpOworICAgIGlmICh2OENvbnRleHQuSXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gdHJ1 ZTsKKworICAgIHY4OjpDb250ZXh0OjpTY29wZSBzY29wZSh2OENvbnRleHQpOworCisgICAgdjg6 OkhhbmRsZTx2ODo6VmFsdWU+IGxpc3RQYXJhbUhhbmRsZSA9IHRvVjgobGlzdFBhcmFtKTsKKyAg ICBpZiAobGlzdFBhcmFtSGFuZGxlLklzRW1wdHkoKSkgeworICAgICAgICBDUkFTSCgpOworICAg ICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKKyAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gYXJn dltdID0geworICAgICAgICBsaXN0UGFyYW1IYW5kbGUKKyAgICB9OworCisgICAgYm9vbCBjYWxs YmFja1JldHVyblZhbHVlID0gZmFsc2U7CisgICAgcmV0dXJuICFpbnZva2VDYWxsYmFjayhtX2Nh bGxiYWNrLCAxLCBhcmd2LCBjYWxsYmFja1JldHVyblZhbHVlLCBzY3JpcHRFeGVjdXRpb25Db250 ZXh0KCkpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBFTkFCTEUo REFUQUJBU0UpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgv VjhUZXN0Q2FsbGJhY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL3Rlc3QvVjgvVjhUZXN0Q2FsbGJhY2suaAkocmV2aXNpb24gODE3OTEpCisrKyBTb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0Q2FsbGJhY2suaAkod29y a2luZyBjb3B5KQpAQCAtNTAsNiArNTAsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGNh bGxiYWNrV2l0aENsYXNzMlBhcmFtKENsYXNzMiogY2xhc3MyUGFyYW0sIGNvbnN0IFN0cmluZyYg c3RyQXJnKTsKICAgICBDT01QSUxFX0FTU0VSVChmYWxzZSkgICAgdmlydHVhbCBpbnQgY2FsbGJh Y2tXaXRoTm9uQm9vbFJldHVyblR5cGUoQ2xhc3MzKiBjbGFzczNQYXJhbSk7CiAgICAgdmlydHVh bCBpbnQgY3VzdG9tQ2FsbGJhY2soQ2xhc3M1KiBjbGFzczVQYXJhbSwgQ2xhc3M2KiBjbGFzczZQ YXJhbSk7CisgICAgdmlydHVhbCBib29sIGNhbGxiYWNrV2l0aFN0cmluZ0xpc3QoUGFzc1JlZlB0 cjxET01TdHJpbmdMaXN0PiBsaXN0UGFyYW0pOwogCiBwcml2YXRlOgogICAgIFY4VGVzdENhbGxi YWNrKHY4OjpMb2NhbDx2ODo6T2JqZWN0PiwgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCopOwo=