30789 2009-10-26 14:00:08 -0700 revert r50073 because bug 30751 was reverted 2009-10-26 15:04:13 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 tony tony dglazkov oldest_to_newest 157910 0 tony 2009-10-26 14:00:08 -0700 r50027 was a chromium build fix due to the patch for bug 30751. Since the patches have been rolled out, we need to roll out the chromium build fixes. 157912 1 41894 tony 2009-10-26 14:02:17 -0700 Created attachment 41894 Patch v1 157920 2 tony 2009-10-26 14:21:27 -0700 dglazkov tells me it's r50073 that needs to be reverted. 157929 3 41900 tony 2009-10-26 14:36:07 -0700 Created attachment 41900 Patch v1 157934 4 41900 eric 2009-10-26 14:44:15 -0700 Comment on attachment 41900 Patch v1 OK. 157952 5 tony 2009-10-26 15:04:13 -0700 Committed r50101: <http://trac.webkit.org/changeset/50101> 41894 2009-10-26 14:02:17 -0700 2009-10-26 14:36:04 -0700 Patch v1 bug-30789-20091026140215.patch text/plain 8895 tony ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODA0ZGYyNS4uYjY2NDg2MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0xMC0yNiAgVG9ueSBDaGFuZyAg PHRvbnlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFJvbGxiYWNrIHI1MDAyNyAoY2hyb21pdW0gYnVpbGQgZml4ZXMgZm9yIHI1 MDA0MSkgc2luY2UKKyAgICAgICAgcjUwMDQxLXI1MDA0MyBoYXZlIGJlZW4gcm9sbGVkIG91dC4K KworICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BTISkKKworICAgICAgICAqIFdlYkNvcmUuZ3lw aToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbToKKyAgICAg ICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhDdXN0b21CaW5kaW5nLmg6CisgICAgICAgICogYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEFsbENvbGxlY3Rpb25DdXN0b20uY3BwOiBSZW1vdmVkLgor ICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxEb2N1bWVudEN1c3RvbS5jcHA6CisK IDIwMDktMTAtMjEgIEplcmVteSBPcmxvdyAgPGpvcmxvd0BjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL1dlYkNvcmUu Z3lwaSBiL1dlYkNvcmUvV2ViQ29yZS5neXBpCmluZGV4IDAzNjI5MzYuLjYxYWRmMjMgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvV2ViQ29yZS5neXBpCisrKyBiL1dlYkNvcmUvV2ViQ29yZS5neXBpCkBA IC02NzgsNyArNjc4LDYgQEAKICAgICAgICAgICAgICdiaW5kaW5ncy92OC9jdXN0b20vVjhGaWxl TGlzdEN1c3RvbS5jcHAnLAogICAgICAgICAgICAgJ2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxB dWRpb0VsZW1lbnRDb25zdHJ1Y3Rvci5jcHAnLAogICAgICAgICAgICAgJ2JpbmRpbmdzL3Y4L2N1 c3RvbS9WOEhUTUxBdWRpb0VsZW1lbnRDb25zdHJ1Y3Rvci5oJywKLSAgICAgICAgICAgICdiaW5k aW5ncy92OC9jdXN0b20vVjhIVE1MQWxsQ29sbGVjdGlvbkN1c3RvbS5jcHAnLAogICAgICAgICAg ICAgJ2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxDYW52YXNFbGVtZW50Q3VzdG9tLmNwcCcsCiAg ICAgICAgICAgICAnYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTENvbGxlY3Rpb25DdXN0b20uY3Bw JywKICAgICAgICAgICAgICdiaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MRGF0YUdyaWRFbGVtZW50 Q3VzdG9tLmNwcCcsCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdl bmVyYXRvclY4LnBtIGIvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5w bQppbmRleCA5NWIyYWEyLi5jNmFmNGZhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCisrKyBiL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9D b2RlR2VuZXJhdG9yVjgucG0KQEAgLTIxNSw2ICsyMTUsNyBAQCBzdWIgQWRkQ2xhc3NGb3J3YXJk SWZOZWVkZWQKIHN1YiBHZXRJbXBsZW1lbnRhdGlvbkZpbGVOYW1lCiB7CiAgICAgbXkgJGlmYWNl ID0gc2hpZnQ7CisgICAgcmV0dXJuICJIVE1MQ29sbGVjdGlvbi5oIiBpZiAkaWZhY2UgZXEgIkhU TUxBbGxDb2xsZWN0aW9uIjsKICAgICByZXR1cm4gIkV2ZW50LmgiIGlmICRpZmFjZSBlcSAiRE9N VGltZVN0YW1wIjsKICAgICByZXR1cm4gIk5hbWVkQXR0ck1hcC5oIiBpZiAkaWZhY2UgZXEgIk5h bWVkTm9kZU1hcCI7CiAgICAgcmV0dXJuICJOYW1lTm9kZUxpc3QuaCIgaWYgJGlmYWNlIGVxICJO b2RlTGlzdCI7CkBAIC0xMzk2LDcgKzEzOTcsNyBAQCBFTkQKICAgICB9CiAKICAgICAjIFNldCB0 aGUgY2xhc3MgbmFtZS4gIFRoaXMgaXMgdXNlZCB3aGVuIHByaW50aW5nIG9iamVjdHMuCi0gICAg cHVzaChAaW1wbENvbnRlbnQsICIgIGRlc2MtPlNldENsYXNzTmFtZSh2ODo6U3RyaW5nOjpOZXco XCIke2ludGVyZmFjZU5hbWV9XCIpKTtcbiIpOworICAgIHB1c2goQGltcGxDb250ZW50LCAiICBk ZXNjLT5TZXRDbGFzc05hbWUodjg6OlN0cmluZzo6TmV3KFwiIiAuIEdldENsYXNzTmFtZSgke2lu dGVyZmFjZU5hbWV9KSAuICJcIikpO1xuIik7CiAKICAgICBpZiAoJGhhc19jb25zdGFudHMpIHsK ICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsIDw8RU5EKTsKQEAgLTE2MjMsNiArMTYyNCwxNSBA QCBzdWIgR2VuZXJhdGVGdW5jdGlvbkNhbGxTdHJpbmcoKQogfQogCiAKKyMgR2V0IHRoZSBjbGFz cyBuYW1lIHVzZWQgZm9yIHByaW50aW5nIGphdmFzY3JpcHQgRE9NLW9iamVjdCB3cmFwcGVycy4K K3N1YiBHZXRDbGFzc05hbWUKK3sKKyAgICBteSAkdHlwZSA9IHNoaWZ0OworICAgIHJldHVybiAi SFRNTENvbGxlY3Rpb24iIGlmICR0eXBlIGVxICJIVE1MQWxsQ29sbGVjdGlvbiI7CisgICAgcmV0 dXJuICR0eXBlOworfQorCisKIHN1YiBHZXRUeXBlRnJvbVNpZ25hdHVyZQogewogICAgIG15ICRz aWduYXR1cmUgPSBzaGlmdDsKQEAgLTE3MDAsNyArMTcxMCw2IEBAIHN1YiBJc1JlZlB0clR5cGUK ICAgICByZXR1cm4gMSBpZiAkdHlwZSBlcSAiRXZlbnRMaXN0ZW5lciI7CiAgICAgcmV0dXJuIDEg aWYgJHR5cGUgZXEgIkZpbGVMaXN0IjsKICAgICByZXR1cm4gMSBpZiAkdHlwZSBlcSAiSFRNTENv bGxlY3Rpb24iOwotICAgIHJldHVybiAxIGlmICR0eXBlIGVxICJIVE1MQWxsQ29sbGVjdGlvbiI7 CiAgICAgcmV0dXJuIDEgaWYgJHR5cGUgZXEgIkhUTUxEb2N1bWVudCI7CiAgICAgcmV0dXJuIDEg aWYgJHR5cGUgZXEgIkhUTUxFbGVtZW50IjsKICAgICByZXR1cm4gMSBpZiAkdHlwZSBlcSAiSFRN TE9wdGlvbnNDb2xsZWN0aW9uIjsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4Q3VzdG9tQmluZGluZy5oIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhDdXN0 b21CaW5kaW5nLmgKaW5kZXggMTk3MWM5Ni4uZmU1MDdhYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9i aW5kaW5ncy92OC9jdXN0b20vVjhDdXN0b21CaW5kaW5nLmgKKysrIGIvV2ViQ29yZS9iaW5kaW5n cy92OC9jdXN0b20vVjhDdXN0b21CaW5kaW5nLmgKQEAgLTI5OSwxMCArMjk5LDYgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogICAgICAgICBERUNMQVJFX0NBTExCQUNLKEhUTUxDb2xsZWN0aW9uTmFt ZWRJdGVtKTsKICAgICAgICAgREVDTEFSRV9DQUxMQkFDSyhIVE1MQ29sbGVjdGlvbkNhbGxBc0Z1 bmN0aW9uKTsKIAotICAgICAgICBERUNMQVJFX0NBTExCQUNLKEhUTUxBbGxDb2xsZWN0aW9uSXRl bSk7Ci0gICAgICAgIERFQ0xBUkVfQ0FMTEJBQ0soSFRNTEFsbENvbGxlY3Rpb25OYW1lZEl0ZW0p OwotICAgICAgICBERUNMQVJFX0NBTExCQUNLKEhUTUxBbGxDb2xsZWN0aW9uQ2FsbEFzRnVuY3Rp b24pOwotCiAgICAgICAgIERFQ0xBUkVfQ0FMTEJBQ0soSFRNTFNlbGVjdEVsZW1lbnRSZW1vdmUp OwogCiAgICAgICAgIERFQ0xBUkVfQ0FMTEJBQ0soSFRNTE9wdGlvbnNDb2xsZWN0aW9uUmVtb3Zl KTsKQEAgLTUyNyw3ICs1MjMsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIERFQ0xB UkVfSU5ERVhFRF9QUk9QRVJUWV9TRVRURVIoSFRNTE9wdGlvbnNDb2xsZWN0aW9uKTsKICAgICAg ICAgREVDTEFSRV9OQU1FRF9QUk9QRVJUWV9HRVRURVIoSFRNTFNlbGVjdEVsZW1lbnRDb2xsZWN0 aW9uKTsKICAgICAgICAgREVDTEFSRV9JTkRFWEVEX1BST1BFUlRZX1NFVFRFUihIVE1MU2VsZWN0 RWxlbWVudENvbGxlY3Rpb24pOwotICAgICAgICBERUNMQVJFX05BTUVEX1BST1BFUlRZX0dFVFRF UihIVE1MQWxsQ29sbGVjdGlvbik7CiAgICAgICAgIERFQ0xBUkVfTkFNRURfUFJPUEVSVFlfR0VU VEVSKEhUTUxDb2xsZWN0aW9uKTsKIAogI2lmIEVOQUJMRSgzRF9DQU5WQVMpCmRpZmYgLS1naXQg YS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxBbGxDb2xsZWN0aW9uQ3VzdG9tLmNw cCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEFsbENvbGxlY3Rpb25DdXN0b20u Y3BwCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBmYjM4N2VhLi4wMDAwMDAwCi0tLSBh L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEFsbENvbGxlY3Rpb25DdXN0b20uY3Bw CisrKyAvZGV2L251bGwKQEAgLTEsMTA5ICswLDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIw MDkgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSAqIAotICogUmVkaXN0cmlidXRp b24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0Ci0g KiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5n IGNvbmRpdGlvbnMgYXJlCi0gKiBtZXQ6Ci0gKiAKLSAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBv ZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCi0g KiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhl IGFib3ZlCi0gKiBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCi0gKiBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Ig b3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCi0gKiBkaXN0cmlidXRpb24uCi0gKiAg ICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRz Ci0gKiBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1 Y3RzIGRlcml2ZWQgZnJvbQotICogdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9y IHdyaXR0ZW4gcGVybWlzc2lvbi4KLSAqIAotICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBC WSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgQU5EIENPTlRSSUJVVE9SUwotICogIkFTIElTIiBBTkQg QU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKLSAq IExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFO RCBGSVRORVNTIEZPUgotICogQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElO IE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQKLSAqIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBC RSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAotICogU1BFQ0lB TCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5P VAotICogTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJW SUNFUzsgTE9TUyBPRiBVU0UsCi0gKiBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRF UlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKLSAqIFRIRU9SWSBPRiBMSUFCSUxJ VFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKLSAqIChJ TkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQg T0YgVEhFIFVTRQotICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQ T1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KLSAqLwotCi0jaW5jbHVkZSAiY29uZmlnLmgiCi0j aW5jbHVkZSAiSFRNTEFsbENvbGxlY3Rpb24uaCIKLQotI2luY2x1ZGUgIlY4QmluZGluZy5oIgot I2luY2x1ZGUgIlY4Q29sbGVjdGlvbi5oIgotI2luY2x1ZGUgIlY4Q3VzdG9tQmluZGluZy5oIgot I2luY2x1ZGUgIlY4UHJveHkuaCIKLQotbmFtZXNwYWNlIFdlYkNvcmUgewotCi1OQU1FRF9QUk9Q RVJUWV9HRVRURVIoSFRNTEFsbENvbGxlY3Rpb24pCi17Ci0gICAgSU5DX1NUQVRTKCJET00uSFRN TEFsbENvbGxlY3Rpb24uTmFtZWRQcm9wZXJ0eUdldHRlciIpOwotICAgIC8vIFNlYXJjaCB0aGUg cHJvdG90eXBlIGNoYWluIGZpcnN0LgotICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB2YWx1ZSA9 IGluZm8uSG9sZGVyKCktPkdldFJlYWxOYW1lZFByb3BlcnR5SW5Qcm90b3R5cGVDaGFpbihuYW1l KTsKLQotICAgIGlmICghdmFsdWUuSXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gdmFsdWU7Ci0K LSAgICAvLyBTZWFyY2ggbG9jYWwgY2FsbGJhY2sgcHJvcGVydGllcyBuZXh0IHRvIGZpbmQgSURM IGRlZmluZWQKLSAgICAvLyBwcm9wZXJ0aWVzLgotICAgIGlmIChpbmZvLkhvbGRlcigpLT5IYXNS ZWFsTmFtZWRDYWxsYmFja1Byb3BlcnR5KG5hbWUpKQotICAgICAgICByZXR1cm4gdjg6OkhhbmRs ZTx2ODo6VmFsdWU+KCk7Ci0KLSAgICAvLyBGaW5hbGx5LCBzZWFyY2ggdGhlIERPTSBzdHJ1Y3R1 cmUuCi0gICAgSFRNTEFsbENvbGxlY3Rpb24qIGltcCA9IFY4RE9NV3JhcHBlcjo6Y29udmVydFRv TmF0aXZlT2JqZWN0PEhUTUxBbGxDb2xsZWN0aW9uPihWOENsYXNzSW5kZXg6OkhUTUxBTExDT0xM RUNUSU9OLCBpbmZvLkhvbGRlcigpKTsKLSAgICByZXR1cm4gZ2V0TmFtZWRJdGVtc0Zyb21Db2xs ZWN0aW9uKGltcCwgdjhTdHJpbmdUb0F0b21pY1dlYkNvcmVTdHJpbmcobmFtZSkpOwotfQotCi1D QUxMQkFDS19GVU5DX0RFQ0woSFRNTEFsbENvbGxlY3Rpb25JdGVtKQotewotICAgIElOQ19TVEFU UygiRE9NLkhUTUxBbGxDb2xsZWN0aW9uLml0ZW0oKSIpOwotICAgIEhUTUxBbGxDb2xsZWN0aW9u KiBpbXAgPSBWOERPTVdyYXBwZXI6OmNvbnZlcnRUb05hdGl2ZU9iamVjdDxIVE1MQWxsQ29sbGVj dGlvbj4oVjhDbGFzc0luZGV4OjpIVE1MQUxMQ09MTEVDVElPTiwgYXJncy5Ib2xkZXIoKSk7Ci0g ICAgcmV0dXJuIGdldEl0ZW1Gcm9tQ29sbGVjdGlvbihpbXAsIGFyZ3NbMF0pOwotfQotCi1DQUxM QkFDS19GVU5DX0RFQ0woSFRNTEFsbENvbGxlY3Rpb25OYW1lZEl0ZW0pCi17Ci0gICAgSU5DX1NU QVRTKCJET00uSFRNTEFsbENvbGxlY3Rpb24ubmFtZWRJdGVtKCkiKTsKLSAgICBIVE1MQWxsQ29s bGVjdGlvbiogaW1wID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9OYXRpdmVPYmplY3Q8SFRNTEFs bENvbGxlY3Rpb24+KFY4Q2xhc3NJbmRleDo6SFRNTEFMTENPTExFQ1RJT04sIGFyZ3MuSG9sZGVy KCkpOwotICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiByZXN1bHQgPSBnZXROYW1lZEl0ZW1zRnJv bUNvbGxlY3Rpb24oaW1wLCB0b1dlYkNvcmVTdHJpbmcoYXJnc1swXSkpOwotCi0gICAgaWYgKHJl c3VsdC5Jc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7Ci0KLSAgICBy ZXR1cm4gcmVzdWx0OwotfQotCi1DQUxMQkFDS19GVU5DX0RFQ0woSFRNTEFsbENvbGxlY3Rpb25D YWxsQXNGdW5jdGlvbikKLXsKLSAgICBJTkNfU1RBVFMoIkRPTS5IVE1MQWxsQ29sbGVjdGlvbi5j YWxsQXNGdW5jdGlvbigpIik7Ci0gICAgaWYgKGFyZ3MuTGVuZ3RoKCkgPCAxKQotICAgICAgICBy ZXR1cm4gdjg6OlVuZGVmaW5lZCgpOwotCi0gICAgSFRNTEFsbENvbGxlY3Rpb24qIGltcCA9IFY4 RE9NV3JhcHBlcjo6Y29udmVydFRvTmF0aXZlT2JqZWN0PEhUTUxBbGxDb2xsZWN0aW9uPihWOENs YXNzSW5kZXg6OkhUTUxBTExDT0xMRUNUSU9OLCBhcmdzLkhvbGRlcigpKTsKLQotICAgIGlmIChh cmdzLkxlbmd0aCgpID09IDEpCi0gICAgICAgIHJldHVybiBnZXRJdGVtRnJvbUNvbGxlY3Rpb24o aW1wLCBhcmdzWzBdKTsKLQotICAgIC8vIElmIHRoZXJlIGlzIGEgc2Vjb25kIGFyZ3VtZW50IGl0 IGlzIHRoZSBpbmRleCBvZiB0aGUgaXRlbSB3ZSB3YW50LgotICAgIFN0cmluZyBuYW1lID0gdG9X ZWJDb3JlU3RyaW5nKGFyZ3NbMF0pOwotICAgIHY4OjpMb2NhbDx2ODo6VWludDMyPiBpbmRleCA9 IGFyZ3NbMV0tPlRvQXJyYXlJbmRleCgpOwotICAgIGlmIChpbmRleC5Jc0VtcHR5KCkpCi0gICAg ICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7Ci0KLSAgICB1bnNpZ25lZCBjdXJyZW50ID0gaW5k ZXgtPlVpbnQzMlZhbHVlKCk7Ci0gICAgTm9kZSogbm9kZSA9IGltcC0+bmFtZWRJdGVtKG5hbWUp OwotICAgIHdoaWxlIChub2RlKSB7Ci0gICAgICAgIGlmICghY3VycmVudCkKLSAgICAgICAgICAg IHJldHVybiBWOERPTVdyYXBwZXI6OmNvbnZlcnROb2RlVG9WOE9iamVjdChub2RlKTsKLQotICAg ICAgICBub2RlID0gaW1wLT5uZXh0TmFtZWRJdGVtKG5hbWUpOwotICAgICAgICBjdXJyZW50LS07 Ci0gICAgfQotCi0gICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKLX0KLQotfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1M RG9jdW1lbnRDdXN0b20uY3BwIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MRG9j dW1lbnRDdXN0b20uY3BwCmluZGV4IGFmYzllZDEuLmEwYzNkNzQgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTERvY3VtZW50Q3VzdG9tLmNwcAorKysgYi9XZWJD b3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxEb2N1bWVudEN1c3RvbS5jcHAKQEAgLTMyLDcg KzMyLDYgQEAKICNpbmNsdWRlICJIVE1MRG9jdW1lbnQuaCIKIAogI2luY2x1ZGUgIkZyYW1lLmgi Ci0jaW5jbHVkZSAiSFRNTEFsbENvbGxlY3Rpb24uaCIKICNpbmNsdWRlICJIVE1MQ29sbGVjdGlv bi5oIgogI2luY2x1ZGUgIkhUTUxJRnJhbWVFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTE5hbWVz Lmgi 41900 2009-10-26 14:36:07 -0700 2009-10-26 14:44:15 -0700 Patch v1 bug-30789-20091026143606.patch text/plain 11189 tony ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODA0ZGYyNS4uYjdhZjA4NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAwOS0xMC0yNiAgVG9ueSBDaGFuZyAg PHRvbnlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFJvbGwgYmFjayByNTAwNzMgYmVjYXVzZSByNTAwNDEtNTAwNDMgd2VyZSBy ZXZlcnRlZC4gIHI1MDA3MyB3YXMKKyAgICAgICAgYSBjaHJvbWl1bSBzaWRlIGZpeCBmb3IgcjUw MDQxLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA3 ODkKKworICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4Q29sbGVjdGlvbi5oOgorICAgICAgICAqIGJp bmRpbmdzL3Y4L2N1c3RvbS9WOEN1c3RvbUJpbmRpbmcuaDoKKyAgICAgICAgKiBiaW5kaW5ncy92 OC9jdXN0b20vVjhIVE1MQWxsQ29sbGVjdGlvbkN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpnZXROYW1lZEl0ZW1zKToKKyAgICAgICAgKFdlYkNvcmU6OmdldEl0ZW0pOgorICAgICAgICAo V2ViQ29yZTo6TkFNRURfUFJPUEVSVFlfR0VUVEVSKToKKyAgICAgICAgKFdlYkNvcmU6OkNBTExC QUNLX0ZVTkNfREVDTCk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTENvbGxl Y3Rpb25DdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Z2V0TmFtZWRJdGVtcyk6CisgICAg ICAgIChXZWJDb3JlOjpnZXRJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6Ok5BTUVEX1BST1BFUlRZ X0dFVFRFUik6CisgICAgICAgIChXZWJDb3JlOjpDQUxMQkFDS19GVU5DX0RFQ0wpOgorICAgICAg ICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxPcHRpb25zQ29sbGVjdGlvbkN1c3RvbS5jcHA6 CisKIDIwMDktMTAtMjEgIEplcmVteSBPcmxvdyAgPGpvcmxvd0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1Y4Q29sbGVjdGlvbi5oIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9WOENvbGxlY3Rpb24u aAppbmRleCA4ZWFlMmEyLi5jYmZlOTIxIDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L1Y4Q29sbGVjdGlvbi5oCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhDb2xsZWN0aW9uLmgK QEAgLTM0LDcgKzM0LDYgQEAKICNpbmNsdWRlICJIVE1MRm9ybUVsZW1lbnQuaCIKICNpbmNsdWRl ICJIVE1MU2VsZWN0RWxlbWVudC5oIgogI2luY2x1ZGUgIlY4QmluZGluZy5oIgotI2luY2x1ZGUg IlY4TmFtZWROb2Rlc0NvbGxlY3Rpb24uaCIKICNpbmNsdWRlICJWOFByb3h5LmgiCiAjaW5jbHVk ZSA8djguaD4KIApAQCAtMjExLDM4ICsyMTAsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAg ICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdG9PcHRpb25zQ29sbGVjdGlvblNldHRlcih1aW50MzJf dCBpbmRleCwgdjg6OkhhbmRsZTx2ODo6VmFsdWU+LCBIVE1MU2VsZWN0RWxlbWVudCopOwogCi0g ICAgdGVtcGxhdGU8Y2xhc3MgQ29sbGVjdGlvbj4KLSAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g Z2V0TmFtZWRJdGVtc0Zyb21Db2xsZWN0aW9uKENvbGxlY3Rpb24qIGNvbGxlY3Rpb24sIEF0b21p Y1N0cmluZyBuYW1lKQotICAgIHsKLSAgICAgICAgVmVjdG9yPFJlZlB0cjxOb2RlPiA+IG5hbWVk SXRlbXM7Ci0gICAgICAgIGNvbGxlY3Rpb24tPm5hbWVkSXRlbXMobmFtZSwgbmFtZWRJdGVtcyk7 Ci0KLSAgICAgICAgaWYgKCFuYW1lZEl0ZW1zLnNpemUoKSkKLSAgICAgICAgICAgIHJldHVybiB2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTsKLQotICAgICAgICBpZiAobmFtZWRJdGVtcy5zaXplKCkg PT0gMSkKLSAgICAgICAgICAgIHJldHVybiBWOERPTVdyYXBwZXI6OmNvbnZlcnROb2RlVG9WOE9i amVjdChuYW1lZEl0ZW1zLmF0KDApLnJlbGVhc2UoKSk7Ci0KLSAgICAgICAgTm9kZUxpc3QqIGxp c3QgPSBuZXcgVjhOYW1lZE5vZGVzQ29sbGVjdGlvbihuYW1lZEl0ZW1zKTsKLSAgICAgICAgcmV0 dXJuIFY4RE9NV3JhcHBlcjo6Y29udmVydFRvVjhPYmplY3QoVjhDbGFzc0luZGV4OjpOT0RFTElT VCwgbGlzdCk7Ci0gICAgfQotCi0gICAgdGVtcGxhdGU8Y2xhc3MgQ29sbGVjdGlvbj4KLSAgICB2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4gZ2V0SXRlbUZyb21Db2xsZWN0aW9uKENvbGxlY3Rpb24qIGNv bGxlY3Rpb24sIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBhcmd1bWVudCkKLSAgICB7Ci0gICAgICAg IHY4OjpMb2NhbDx2ODo6VWludDMyPiBpbmRleCA9IGFyZ3VtZW50LT5Ub0FycmF5SW5kZXgoKTsK LSAgICAgICAgaWYgKGluZGV4LklzRW1wdHkoKSkgewotICAgICAgICAgICAgdjg6OkhhbmRsZTx2 ODo6VmFsdWU+IHJlc3VsdCA9IGdldE5hbWVkSXRlbXNGcm9tQ29sbGVjdGlvbihjb2xsZWN0aW9u LCB0b1dlYkNvcmVTdHJpbmcoYXJndW1lbnQtPlRvU3RyaW5nKCkpKTsKLQotICAgICAgICAgICAg aWYgKHJlc3VsdC5Jc0VtcHR5KCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIHY4OjpVbmRlZmlu ZWQoKTsKLQotICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKLSAgICAgICAgfQotCi0gICAgICAg IFJlZlB0cjxOb2RlPiByZXN1bHQgPSBjb2xsZWN0aW9uLT5pdGVtKGluZGV4LT5VaW50MzJWYWx1 ZSgpKTsKLSAgICAgICAgcmV0dXJuIFY4RE9NV3JhcHBlcjo6Y29udmVydE5vZGVUb1Y4T2JqZWN0 KHJlc3VsdC5yZWxlYXNlKCkpOwotICAgIH0KIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2Vu ZGlmIC8vIFY4Q29sbGVjdGlvbl9oCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1 c3RvbS9WOEN1c3RvbUJpbmRpbmcuaCBiL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q3Vz dG9tQmluZGluZy5oCmluZGV4IDE5NzFjOTYuLmQ5ZjkzNDQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv YmluZGluZ3MvdjgvY3VzdG9tL1Y4Q3VzdG9tQmluZGluZy5oCisrKyBiL1dlYkNvcmUvYmluZGlu Z3MvdjgvY3VzdG9tL1Y4Q3VzdG9tQmluZGluZy5oCkBAIC0yODAsOCArMjgwLDYgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogCiAgICAgICAgIERFQ0xBUkVfUFJPUEVSVFlfQUNDRVNTT1JfU0VUVEVS KEF0dHJWYWx1ZSk7CiAKLSAgICAgICAgREVDTEFSRV9DQUxMQkFDSyhIVE1MT3B0aW9uc0NvbGxl Y3Rpb25JdGVtKTsKLSAgICAgICAgREVDTEFSRV9DQUxMQkFDSyhIVE1MT3B0aW9uc0NvbGxlY3Rp b25OYW1lZEl0ZW0pOwogICAgICAgICBERUNMQVJFX1BST1BFUlRZX0FDQ0VTU09SKEhUTUxPcHRp b25zQ29sbGVjdGlvbkxlbmd0aCk7CiAKICAgICAgICAgREVDTEFSRV9DQUxMQkFDSyhIVE1MSW5w dXRFbGVtZW50U2V0U2VsZWN0aW9uUmFuZ2UpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9iaW5kaW5n cy92OC9jdXN0b20vVjhIVE1MQWxsQ29sbGVjdGlvbkN1c3RvbS5jcHAgYi9XZWJDb3JlL2JpbmRp bmdzL3Y4L2N1c3RvbS9WOEhUTUxBbGxDb2xsZWN0aW9uQ3VzdG9tLmNwcAppbmRleCBmYjM4N2Vh Li40MTlmMzc0IDEwMDY0NAotLS0gYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxB bGxDb2xsZWN0aW9uQ3VzdG9tLmNwcAorKysgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9W OEhUTUxBbGxDb2xsZWN0aW9uQ3VzdG9tLmNwcApAQCAtMzIsMTIgKzMyLDQzIEBACiAjaW5jbHVk ZSAiSFRNTEFsbENvbGxlY3Rpb24uaCIKIAogI2luY2x1ZGUgIlY4QmluZGluZy5oIgotI2luY2x1 ZGUgIlY4Q29sbGVjdGlvbi5oIgogI2luY2x1ZGUgIlY4Q3VzdG9tQmluZGluZy5oIgorI2luY2x1 ZGUgIlY4TmFtZWROb2Rlc0NvbGxlY3Rpb24uaCIKICNpbmNsdWRlICJWOFByb3h5LmgiCiAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAorc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBnZXROYW1l ZEl0ZW1zKEhUTUxBbGxDb2xsZWN0aW9uKiBjb2xsZWN0aW9uLCBBdG9taWNTdHJpbmcgbmFtZSkK K3sKKyAgICBWZWN0b3I8UmVmUHRyPE5vZGU+ID4gbmFtZWRJdGVtczsKKyAgICBjb2xsZWN0aW9u LT5uYW1lZEl0ZW1zKG5hbWUsIG5hbWVkSXRlbXMpOworCisgICAgaWYgKCFuYW1lZEl0ZW1zLnNp emUoKSkKKyAgICAgICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVlPigpOworCisgICAgaWYg KG5hbWVkSXRlbXMuc2l6ZSgpID09IDEpCisgICAgICAgIHJldHVybiBWOERPTVdyYXBwZXI6OmNv bnZlcnROb2RlVG9WOE9iamVjdChuYW1lZEl0ZW1zLmF0KDApLnJlbGVhc2UoKSk7CisKKyAgICBO b2RlTGlzdCogbGlzdCA9IG5ldyBWOE5hbWVkTm9kZXNDb2xsZWN0aW9uKG5hbWVkSXRlbXMpOwor ICAgIHJldHVybiBWOERPTVdyYXBwZXI6OmNvbnZlcnRUb1Y4T2JqZWN0KFY4Q2xhc3NJbmRleDo6 Tk9ERUxJU1QsIGxpc3QpOworfQorCitzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGdldEl0 ZW0oSFRNTEFsbENvbGxlY3Rpb24qIGNvbGxlY3Rpb24sIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBh cmd1bWVudCkKK3sKKyAgICB2ODo6TG9jYWw8djg6OlVpbnQzMj4gaW5kZXggPSBhcmd1bWVudC0+ VG9BcnJheUluZGV4KCk7CisgICAgaWYgKGluZGV4LklzRW1wdHkoKSkgeworICAgICAgICB2ODo6 SGFuZGxlPHY4OjpWYWx1ZT4gcmVzdWx0ID0gZ2V0TmFtZWRJdGVtcyhjb2xsZWN0aW9uLCB0b1dl YkNvcmVTdHJpbmcoYXJndW1lbnQtPlRvU3RyaW5nKCkpKTsKKworICAgICAgICBpZiAocmVzdWx0 LklzRW1wdHkoKSkKKyAgICAgICAgICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7CisKKyAgICAg ICAgcmV0dXJuIHJlc3VsdDsKKyAgICB9CisKKyAgICBSZWZQdHI8Tm9kZT4gcmVzdWx0ID0gY29s bGVjdGlvbi0+aXRlbShpbmRleC0+VWludDMyVmFsdWUoKSk7CisgICAgcmV0dXJuIFY4RE9NV3Jh cHBlcjo6Y29udmVydE5vZGVUb1Y4T2JqZWN0KHJlc3VsdC5yZWxlYXNlKCkpOworfQorCiBOQU1F RF9QUk9QRVJUWV9HRVRURVIoSFRNTEFsbENvbGxlY3Rpb24pCiB7CiAgICAgSU5DX1NUQVRTKCJE T00uSFRNTEFsbENvbGxlY3Rpb24uTmFtZWRQcm9wZXJ0eUdldHRlciIpOwpAQCAtNTQsMjEgKzg1 LDIxIEBAIE5BTUVEX1BST1BFUlRZX0dFVFRFUihIVE1MQWxsQ29sbGVjdGlvbikKIAogICAgIC8v IEZpbmFsbHksIHNlYXJjaCB0aGUgRE9NIHN0cnVjdHVyZS4KICAgICBIVE1MQWxsQ29sbGVjdGlv biogaW1wID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9OYXRpdmVPYmplY3Q8SFRNTEFsbENvbGxl Y3Rpb24+KFY4Q2xhc3NJbmRleDo6SFRNTEFMTENPTExFQ1RJT04sIGluZm8uSG9sZGVyKCkpOwot ICAgIHJldHVybiBnZXROYW1lZEl0ZW1zRnJvbUNvbGxlY3Rpb24oaW1wLCB2OFN0cmluZ1RvQXRv bWljV2ViQ29yZVN0cmluZyhuYW1lKSk7CisgICAgcmV0dXJuIGdldE5hbWVkSXRlbXMoaW1wLCB2 OFN0cmluZ1RvQXRvbWljV2ViQ29yZVN0cmluZyhuYW1lKSk7CiB9CiAKIENBTExCQUNLX0ZVTkNf REVDTChIVE1MQWxsQ29sbGVjdGlvbkl0ZW0pCiB7CiAgICAgSU5DX1NUQVRTKCJET00uSFRNTEFs bENvbGxlY3Rpb24uaXRlbSgpIik7CiAgICAgSFRNTEFsbENvbGxlY3Rpb24qIGltcCA9IFY4RE9N V3JhcHBlcjo6Y29udmVydFRvTmF0aXZlT2JqZWN0PEhUTUxBbGxDb2xsZWN0aW9uPihWOENsYXNz SW5kZXg6OkhUTUxBTExDT0xMRUNUSU9OLCBhcmdzLkhvbGRlcigpKTsKLSAgICByZXR1cm4gZ2V0 SXRlbUZyb21Db2xsZWN0aW9uKGltcCwgYXJnc1swXSk7CisgICAgcmV0dXJuIGdldEl0ZW0oaW1w LCBhcmdzWzBdKTsKIH0KIAogQ0FMTEJBQ0tfRlVOQ19ERUNMKEhUTUxBbGxDb2xsZWN0aW9uTmFt ZWRJdGVtKQogewogICAgIElOQ19TVEFUUygiRE9NLkhUTUxBbGxDb2xsZWN0aW9uLm5hbWVkSXRl bSgpIik7CiAgICAgSFRNTEFsbENvbGxlY3Rpb24qIGltcCA9IFY4RE9NV3JhcHBlcjo6Y29udmVy dFRvTmF0aXZlT2JqZWN0PEhUTUxBbGxDb2xsZWN0aW9uPihWOENsYXNzSW5kZXg6OkhUTUxBTExD T0xMRUNUSU9OLCBhcmdzLkhvbGRlcigpKTsKLSAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gcmVz dWx0ID0gZ2V0TmFtZWRJdGVtc0Zyb21Db2xsZWN0aW9uKGltcCwgdG9XZWJDb3JlU3RyaW5nKGFy Z3NbMF0pKTsKKyAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gcmVzdWx0ID0gZ2V0TmFtZWRJdGVt cyhpbXAsIHRvV2ViQ29yZVN0cmluZyhhcmdzWzBdKSk7CiAKICAgICBpZiAocmVzdWx0LklzRW1w dHkoKSkKICAgICAgICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKQEAgLTg1LDcgKzExNiw3IEBA IENBTExCQUNLX0ZVTkNfREVDTChIVE1MQWxsQ29sbGVjdGlvbkNhbGxBc0Z1bmN0aW9uKQogICAg IEhUTUxBbGxDb2xsZWN0aW9uKiBpbXAgPSBWOERPTVdyYXBwZXI6OmNvbnZlcnRUb05hdGl2ZU9i amVjdDxIVE1MQWxsQ29sbGVjdGlvbj4oVjhDbGFzc0luZGV4OjpIVE1MQUxMQ09MTEVDVElPTiwg YXJncy5Ib2xkZXIoKSk7CiAKICAgICBpZiAoYXJncy5MZW5ndGgoKSA9PSAxKQotICAgICAgICBy ZXR1cm4gZ2V0SXRlbUZyb21Db2xsZWN0aW9uKGltcCwgYXJnc1swXSk7CisgICAgICAgIHJldHVy biBnZXRJdGVtKGltcCwgYXJnc1swXSk7CiAKICAgICAvLyBJZiB0aGVyZSBpcyBhIHNlY29uZCBh cmd1bWVudCBpdCBpcyB0aGUgaW5kZXggb2YgdGhlIGl0ZW0gd2Ugd2FudC4KICAgICBTdHJpbmcg bmFtZSA9IHRvV2ViQ29yZVN0cmluZyhhcmdzWzBdKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTENvbGxlY3Rpb25DdXN0b20uY3BwIGIvV2ViQ29yZS9iaW5k aW5ncy92OC9jdXN0b20vVjhIVE1MQ29sbGVjdGlvbkN1c3RvbS5jcHAKaW5kZXggYzQ1YzQxYi4u N2M5YjQwZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MQ29s bGVjdGlvbkN1c3RvbS5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1M Q29sbGVjdGlvbkN1c3RvbS5jcHAKQEAgLTMyLDEyICszMiw0MyBAQAogI2luY2x1ZGUgIkhUTUxD b2xsZWN0aW9uLmgiCiAKICNpbmNsdWRlICJWOEJpbmRpbmcuaCIKLSNpbmNsdWRlICJWOENvbGxl Y3Rpb24uaCIKICNpbmNsdWRlICJWOEN1c3RvbUJpbmRpbmcuaCIKKyNpbmNsdWRlICJWOE5hbWVk Tm9kZXNDb2xsZWN0aW9uLmgiCiAjaW5jbHVkZSAiVjhQcm94eS5oIgogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKK3N0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gZ2V0TmFtZWRJdGVtcyhIVE1M Q29sbGVjdGlvbiogY29sbGVjdGlvbiwgQXRvbWljU3RyaW5nIG5hbWUpCit7CisgICAgVmVjdG9y PFJlZlB0cjxOb2RlPiA+IG5hbWVkSXRlbXM7CisgICAgY29sbGVjdGlvbi0+bmFtZWRJdGVtcyhu YW1lLCBuYW1lZEl0ZW1zKTsKKworICAgIGlmICghbmFtZWRJdGVtcy5zaXplKCkpCisgICAgICAg IHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTsKKworICAgIGlmIChuYW1lZEl0ZW1zLnNp emUoKSA9PSAxKQorICAgICAgICByZXR1cm4gVjhET01XcmFwcGVyOjpjb252ZXJ0Tm9kZVRvVjhP YmplY3QobmFtZWRJdGVtcy5hdCgwKS5yZWxlYXNlKCkpOworCisgICAgTm9kZUxpc3QqIGxpc3Qg PSBuZXcgVjhOYW1lZE5vZGVzQ29sbGVjdGlvbihuYW1lZEl0ZW1zKTsKKyAgICByZXR1cm4gVjhE T01XcmFwcGVyOjpjb252ZXJ0VG9WOE9iamVjdChWOENsYXNzSW5kZXg6Ok5PREVMSVNULCBsaXN0 KTsKK30KKworc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBnZXRJdGVtKEhUTUxDb2xsZWN0 aW9uKiBjb2xsZWN0aW9uLCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gYXJndW1lbnQpCit7CisgICAg djg6OkxvY2FsPHY4OjpVaW50MzI+IGluZGV4ID0gYXJndW1lbnQtPlRvQXJyYXlJbmRleCgpOwor ICAgIGlmIChpbmRleC5Jc0VtcHR5KCkpIHsKKyAgICAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+ IHJlc3VsdCA9IGdldE5hbWVkSXRlbXMoY29sbGVjdGlvbiwgdG9XZWJDb3JlU3RyaW5nKGFyZ3Vt ZW50LT5Ub1N0cmluZygpKSk7CisKKyAgICAgICAgaWYgKHJlc3VsdC5Jc0VtcHR5KCkpCisgICAg ICAgICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgpOworCisgICAgICAgIHJldHVybiByZXN1bHQ7 CisgICAgfQorCisgICAgUmVmUHRyPE5vZGU+IHJlc3VsdCA9IGNvbGxlY3Rpb24tPml0ZW0oaW5k ZXgtPlVpbnQzMlZhbHVlKCkpOworICAgIHJldHVybiBWOERPTVdyYXBwZXI6OmNvbnZlcnROb2Rl VG9WOE9iamVjdChyZXN1bHQucmVsZWFzZSgpKTsKK30KKwogTkFNRURfUFJPUEVSVFlfR0VUVEVS KEhUTUxDb2xsZWN0aW9uKQogewogICAgIElOQ19TVEFUUygiRE9NLkhUTUxDb2xsZWN0aW9uLk5h bWVkUHJvcGVydHlHZXR0ZXIiKTsKQEAgLTU0LDIxICs4NSwyMSBAQCBOQU1FRF9QUk9QRVJUWV9H RVRURVIoSFRNTENvbGxlY3Rpb24pCiAKICAgICAvLyBGaW5hbGx5LCBzZWFyY2ggdGhlIERPTSBz dHJ1Y3R1cmUuCiAgICAgSFRNTENvbGxlY3Rpb24qIGltcCA9IFY4RE9NV3JhcHBlcjo6Y29udmVy dFRvTmF0aXZlT2JqZWN0PEhUTUxDb2xsZWN0aW9uPihWOENsYXNzSW5kZXg6OkhUTUxDT0xMRUNU SU9OLCBpbmZvLkhvbGRlcigpKTsKLSAgICByZXR1cm4gZ2V0TmFtZWRJdGVtc0Zyb21Db2xsZWN0 aW9uKGltcCwgdjhTdHJpbmdUb0F0b21pY1dlYkNvcmVTdHJpbmcobmFtZSkpOworICAgIHJldHVy biBnZXROYW1lZEl0ZW1zKGltcCwgdjhTdHJpbmdUb0F0b21pY1dlYkNvcmVTdHJpbmcobmFtZSkp OwogfQogCiBDQUxMQkFDS19GVU5DX0RFQ0woSFRNTENvbGxlY3Rpb25JdGVtKQogewogICAgIElO Q19TVEFUUygiRE9NLkhUTUxDb2xsZWN0aW9uLml0ZW0oKSIpOwogICAgIEhUTUxDb2xsZWN0aW9u KiBpbXAgPSBWOERPTVdyYXBwZXI6OmNvbnZlcnRUb05hdGl2ZU9iamVjdDxIVE1MQ29sbGVjdGlv bj4oVjhDbGFzc0luZGV4OjpIVE1MQ09MTEVDVElPTiwgYXJncy5Ib2xkZXIoKSk7Ci0gICAgcmV0 dXJuIGdldEl0ZW1Gcm9tQ29sbGVjdGlvbihpbXAsIGFyZ3NbMF0pOworICAgIHJldHVybiBnZXRJ dGVtKGltcCwgYXJnc1swXSk7CiB9CiAKIENBTExCQUNLX0ZVTkNfREVDTChIVE1MQ29sbGVjdGlv bk5hbWVkSXRlbSkKIHsKICAgICBJTkNfU1RBVFMoIkRPTS5IVE1MQ29sbGVjdGlvbi5uYW1lZEl0 ZW0oKSIpOwogICAgIEhUTUxDb2xsZWN0aW9uKiBpbXAgPSBWOERPTVdyYXBwZXI6OmNvbnZlcnRU b05hdGl2ZU9iamVjdDxIVE1MQ29sbGVjdGlvbj4oVjhDbGFzc0luZGV4OjpIVE1MQ09MTEVDVElP TiwgYXJncy5Ib2xkZXIoKSk7Ci0gICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHJlc3VsdCA9IGdl dE5hbWVkSXRlbXNGcm9tQ29sbGVjdGlvbihpbXAsIHRvV2ViQ29yZVN0cmluZyhhcmdzWzBdKSk7 CisgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHJlc3VsdCA9IGdldE5hbWVkSXRlbXMoaW1wLCB0 b1dlYkNvcmVTdHJpbmcoYXJnc1swXSkpOwogCiAgICAgaWYgKHJlc3VsdC5Jc0VtcHR5KCkpCiAg ICAgICAgIHJldHVybiB2ODo6VW5kZWZpbmVkKCk7CkBAIC04NSw3ICsxMTYsNyBAQCBDQUxMQkFD S19GVU5DX0RFQ0woSFRNTENvbGxlY3Rpb25DYWxsQXNGdW5jdGlvbikKICAgICBIVE1MQ29sbGVj dGlvbiogaW1wID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9OYXRpdmVPYmplY3Q8SFRNTENvbGxl Y3Rpb24+KFY4Q2xhc3NJbmRleDo6SFRNTENPTExFQ1RJT04sIGFyZ3MuSG9sZGVyKCkpOwogCiAg ICAgaWYgKGFyZ3MuTGVuZ3RoKCkgPT0gMSkKLSAgICAgICAgcmV0dXJuIGdldEl0ZW1Gcm9tQ29s bGVjdGlvbihpbXAsIGFyZ3NbMF0pOworICAgICAgICByZXR1cm4gZ2V0SXRlbShpbXAsIGFyZ3Nb MF0pOwogCiAgICAgLy8gSWYgdGhlcmUgaXMgYSBzZWNvbmQgYXJndW1lbnQgaXQgaXMgdGhlIGlu ZGV4IG9mIHRoZSBpdGVtIHdlIHdhbnQuCiAgICAgU3RyaW5nIG5hbWUgPSB0b1dlYkNvcmVTdHJp bmcoYXJnc1swXSk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhU TUxPcHRpb25zQ29sbGVjdGlvbkN1c3RvbS5jcHAgYi9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOEhUTUxPcHRpb25zQ29sbGVjdGlvbkN1c3RvbS5jcHAKaW5kZXggMTUwMTViNC4uMDJjMzQ5 OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MT3B0aW9uc0Nv bGxlY3Rpb25DdXN0b20uY3BwCisrKyBiL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRN TE9wdGlvbnNDb2xsZWN0aW9uQ3VzdG9tLmNwcApAQCAtMTMzLDIzICsxMzMsNCBAQCBJTkRFWEVE X1BST1BFUlRZX1NFVFRFUihIVE1MT3B0aW9uc0NvbGxlY3Rpb24pCiAgICAgcmV0dXJuIHRvT3B0 aW9uc0NvbGxlY3Rpb25TZXR0ZXIoaW5kZXgsIHZhbHVlLCBiYXNlKTsKIH0KIAotQ0FMTEJBQ0tf RlVOQ19ERUNMKEhUTUxPcHRpb25zQ29sbGVjdGlvbkl0ZW0pCi17Ci0gICAgSU5DX1NUQVRTKCJE T00uSFRNTE9wdGlvbnNDb2xsZWN0aW9uLml0ZW0oKSIpOwotICAgIEhUTUxPcHRpb25zQ29sbGVj dGlvbiogaW1wID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9OYXRpdmVPYmplY3Q8SFRNTE9wdGlv bnNDb2xsZWN0aW9uPihWOENsYXNzSW5kZXg6OkhUTUxPUFRJT05TQ09MTEVDVElPTiwgYXJncy5I b2xkZXIoKSk7Ci0gICAgcmV0dXJuIGdldEl0ZW1Gcm9tQ29sbGVjdGlvbihpbXAsIGFyZ3NbMF0p OwotfQotCi1DQUxMQkFDS19GVU5DX0RFQ0woSFRNTE9wdGlvbnNDb2xsZWN0aW9uTmFtZWRJdGVt KQotewotICAgIElOQ19TVEFUUygiRE9NLkhUTUxPcHRpb25zQ29sbGVjdGlvbi5uYW1lZEl0ZW0o KSIpOwotICAgIEhUTUxPcHRpb25zQ29sbGVjdGlvbiogaW1wID0gVjhET01XcmFwcGVyOjpjb252 ZXJ0VG9OYXRpdmVPYmplY3Q8SFRNTE9wdGlvbnNDb2xsZWN0aW9uPihWOENsYXNzSW5kZXg6OkhU TUxPUFRJT05TQ09MTEVDVElPTiwgYXJncy5Ib2xkZXIoKSk7Ci0gICAgdjg6OkhhbmRsZTx2ODo6 VmFsdWU+IHJlc3VsdCA9IGdldE5hbWVkSXRlbXNGcm9tQ29sbGVjdGlvbihpbXAsIHRvV2ViQ29y ZVN0cmluZyhhcmdzWzBdKSk7Ci0KLSAgICBpZiAocmVzdWx0LklzRW1wdHkoKSkKLSAgICAgICAg cmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKLQotICAgIHJldHVybiByZXN1bHQ7Ci19Ci0KIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmU=