120773 2013-09-05 07:53:53 -0700 WTF::OwnPtr should behave similarly with the rest of WTF smart pointers 2013-09-11 07:42:05 -0700 1 1 1 Unclassified WebKit Web Template Framework 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 120778 1 mikhail.pozdnyakov mikhail.pozdnyakov andersca benjamin cdumez cmarcelo commit-queue darin dino dstockwell gyuyoung.kim kling rakuco simon.fraser oldest_to_newest 925027 0 mikhail.pozdnyakov 2013-09-05 07:53:53 -0700 At the moment, unlike most of WTF smart pointers, PassOwnPtr can take either the pointer type or the pointed-to type. It means that OwnPtr<SomeType> is the same as OwnPtr<SomeType*> which is wrong for the following reasons: 1) It distinguishes OwnPtr behaviour from other WTF (and not only WTF!) smart pointer classes behaviour 2) The code like OwnPtr<SomeType> a; OwnPtr<SomeType*> b = adoptRef(..); a = b.release(); looks weird 3) It is potentially error-prone as it actually modifies the type given by the Client in opaque way. 925029 1 210616 mikhail.pozdnyakov 2013-09-05 08:01:00 -0700 Created attachment 210616 patch 925059 2 210616 buildbot 2013-09-05 08:46:57 -0700 Comment on attachment 210616 patch Attachment 210616 did not pass win-ews (win): Output: http://webkit-queues.appspot.com/results/1691867 925068 3 210625 mikhail.pozdnyakov 2013-09-05 09:13:56 -0700 Created attachment 210625 try fix Win 925082 4 210625 buildbot 2013-09-05 09:52:25 -0700 Comment on attachment 210625 try fix Win Attachment 210625 did not pass win-ews (win): Output: http://webkit-queues.appspot.com/results/1692916 925083 5 darin 2013-09-05 09:52:42 -0700 RetainPtr also has this feature. 925084 6 andersca 2013-09-05 09:56:43 -0700 (In reply to comment #5) > RetainPtr also has this feature. RetainPtr has this for a good reason. OwnPtr has this to support putting GDI objects in OwnPtrs. I think we should add a new smart pointer for GDI objects and make OwnPtr simpler. 925094 7 andersca 2013-09-05 10:11:22 -0700 (In reply to comment #6) > (In reply to comment #5) > > RetainPtr also has this feature. > > RetainPtr has this for a good reason. OwnPtr has this to support putting GDI objects in OwnPtrs. > > I think we should add a new smart pointer for GDI objects and make OwnPtr simpler. Brent filed https://bugs.webkit.org/show_bug.cgi?id=120778 following our discussion on IRC. 925326 8 darin 2013-09-05 17:54:16 -0700 Ah, right. RetainPtr has this so that it can work with both CF style where the typedef is a pointer type and the NS style where the type is an Objective-C object type. 927688 9 211290 mikhail.pozdnyakov 2013-09-11 01:43:57 -0700 Created attachment 211290 rebased 927777 10 211290 commit-queue 2013-09-11 07:42:02 -0700 Comment on attachment 211290 rebased Clearing flags on attachment: 211290 Committed r155527: <http://trac.webkit.org/changeset/155527> 927778 11 commit-queue 2013-09-11 07:42:05 -0700 All reviewed patches have been landed. Closing bug. 210616 2013-09-05 08:01:00 -0700 2013-09-05 09:13:56 -0700 patch bug120773 text/plain 7992 mikhail.pozdnyakov Y29tbWl0IDRmMmI0NWFkNGNiMDZhZjAxNWI3Nzc2Yzg2OWQzNmIwMjUwYTk1MTYKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg VGh1IFNlcCA1IDE4OjAwOjEzIDIwMTMgKzAzMDAKCiAgICBidWcxMjA3NzMKCmRpZmYgLS1naXQg YS9Tb3VyY2UvV1RGL0NoYW5nZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGI2Mzlj OGYuLjJmNDk1YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAKIDIwMTMtMDktMDUgIE1pa2hhaWwgUG96 ZG55YWtvdiAgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CiAKKyAgICAgICAgV1RGOjpP d25QdHIgc2hvdWxkIGJlaGF2ZSBzaW1pbGFybHkgd2l0aCB0aGUgcmVzdCBvZiBXVEYgc21hcnQg cG9pbnRlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyMDc3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg QmVmb3JlIHRoZSBjaGFuZ2UgT3duUHRyIGNvdWxkIHRha2UgZWl0aGVyIHRoZSBwb2ludGVyIHR5 cGUgb3IgdGhlIHBvaW50ZWQtdG8gdHlwZSwgd2hpY2ggd2FzIGJhZAorICAgICAgIGZvciB0aGUg Zm9sbG93aW5nIHJlYXNvbnM6CisgICAgICAgLSBJdCBkaXN0aW5ndWlzaGVkIE93blB0ciBiZWhh dmlvdXIgZnJvbSBvdGhlciBXVEYgc21hcnQgcG9pbnRlciBjbGFzc2VzIGJlaGF2aW91ciAoc28g aXQgd2FzIGNvbmZ1c2luZyBmb3IgdGhlIENsaWVudCkuCisgICAgICAgLSBJdCB3YXMgcG90ZW50 aWFsIGVycm9yLXByb25lIGFzIGl0IGFjdHVhbGx5IG1vZGlmaWVkIHRoZSB0eXBlIGdpdmVuIGJ5 IHRoZSBDbGllbnQgaW4gb3BhcXVlIHdheS4KKworICAgICAgICAqIHd0Zi9Pd25QdHIuaDoKKyAg ICAgICAgKiB3dGYvUGFzc093blB0ci5oOgorCisyMDEzLTA5LTA1ICBNaWtoYWlsIFBvemRueWFr b3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgorCiAgICAgICAgIFJlbW92ZSBTdHJp bmcoUmVmUHRyPFN0cmluZ0ltcGw+KSBjb25zdHJ1Y3RvcgogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIwNzY3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X VEYvd3RmL093blB0ci5oIGIvU291cmNlL1dURi93dGYvT3duUHRyLmgKaW5kZXggZmE3OWFhMS4u MGNmZGJhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvT3duUHRyLmgKKysrIGIvU291cmNl L1dURi93dGYvT3duUHRyLmgKQEAgLTMxLDggKzMxLDYgQEAKIAogbmFtZXNwYWNlIFdURiB7CiAK LSAgICAvLyBVbmxpa2UgbW9zdCBvZiBvdXIgc21hcnQgcG9pbnRlcnMsIE93blB0ciBjYW4gdGFr ZSBlaXRoZXIgdGhlIHBvaW50ZXIgdHlwZSBvciB0aGUgcG9pbnRlZC10byB0eXBlLgotCiAgICAg dGVtcGxhdGU8dHlwZW5hbWUgVD4gY2xhc3MgUGFzc093blB0cjsKICAgICB0ZW1wbGF0ZTx0eXBl bmFtZSBUPiBQYXNzT3duUHRyPFQ+IGFkb3B0UHRyKFQqKTsKIApAQCAtNDMsNyArNDEsNyBAQCBu YW1lc3BhY2UgV1RGIHsKICAgICAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoT3duUHRyKTsKICNl bmRpZgogICAgIHB1YmxpYzoKLSAgICAgICAgdHlwZWRlZiB0eXBlbmFtZSBSZW1vdmVQb2ludGVy PFQ+OjpUeXBlIFZhbHVlVHlwZTsKKyAgICAgICAgdHlwZWRlZiBUIFZhbHVlVHlwZTsKICAgICAg ICAgdHlwZWRlZiBWYWx1ZVR5cGUqIFB0clR5cGU7CiAKICAgICAgICAgT3duUHRyKCkgOiBtX3B0 cigwKSB7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL1Bhc3NPd25QdHIuaCBiL1NvdXJj ZS9XVEYvd3RmL1Bhc3NPd25QdHIuaAppbmRleCBjYjg3NTM5Li4xODZiYjM3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV1RGL3d0Zi9QYXNzT3duUHRyLmgKKysrIGIvU291cmNlL1dURi93dGYvUGFzc093 blB0ci5oCkBAIC0zMyw4ICszMyw2IEBACiAKIG5hbWVzcGFjZSBXVEYgewogCi0gICAgLy8gVW5s aWtlIG1vc3Qgb2Ygb3VyIHNtYXJ0IHBvaW50ZXJzLCBQYXNzT3duUHRyIGNhbiB0YWtlIGVpdGhl ciB0aGUgcG9pbnRlciB0eXBlIG9yIHRoZSBwb2ludGVkLXRvIHR5cGUuCi0KICAgICB0ZW1wbGF0 ZTx0eXBlbmFtZSBUPiBjbGFzcyBPd25QdHI7CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gY2xh c3MgUGFzc093blB0cjsKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBQYXNzT3duUHRyPFQ+IGFk b3B0UHRyKFQqKTsKQEAgLTQ0LDcgKzQyLDcgQEAgbmFtZXNwYWNlIFdURiB7CiAKICAgICB0ZW1w bGF0ZTx0eXBlbmFtZSBUPiBjbGFzcyBQYXNzT3duUHRyIHsKICAgICBwdWJsaWM6Ci0gICAgICAg IHR5cGVkZWYgdHlwZW5hbWUgUmVtb3ZlUG9pbnRlcjxUPjo6VHlwZSBWYWx1ZVR5cGU7CisgICAg ICAgIHR5cGVkZWYgVCBWYWx1ZVR5cGU7CiAgICAgICAgIHR5cGVkZWYgVmFsdWVUeXBlKiBQdHJU eXBlOwogCiAgICAgICAgIFBhc3NPd25QdHIoKSA6IG1fcHRyKDApIHsgfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4 IDVkOWNjNWUuLmY0MzE0MjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMy0wOS0w NSAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4KKwor ICAgICAgICBXVEY6Ok93blB0ciBzaG91bGQgYmVoYXZlIHNpbWlsYXJseSB3aXRoIHRoZSByZXN0 IG9mIFdURiBzbWFydCBwb2ludGVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTIwNzczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICBCZWZvcmUgdGhlIGNoYW5nZSBPd25QdHIgY291bGQgdGFrZSBlaXRoZXIg dGhlIHBvaW50ZXIgdHlwZSBvciB0aGUgcG9pbnRlZC10byB0eXBlLCB3aGljaCB3YXMgYmFkCisg ICAgICAgZm9yIHRoZSBmb2xsb3dpbmcgcmVhc29uczoKKyAgICAgICAtIEl0IGRpc3Rpbmd1aXNo ZWQgT3duUHRyIGJlaGF2aW91ciBmcm9tIG90aGVyIFdURiBzbWFydCBwb2ludGVyIGNsYXNzZXMg YmVoYXZpb3VyIChzbyBpdCB3YXMgY29uZnVzaW5nIGZvciB0aGUgQ2xpZW50KS4KKyAgICAgICAt IEl0IHdhcyBwb3RlbnRpYWwgZXJyb3ItcHJvbmUgYXMgaXQgYWN0dWFsbHkgbW9kaWZpZWQgdGhl IHR5cGUgZ2l2ZW4gYnkgdGhlIENsaWVudCBpbiBvcGFxdWUgd2F5LgorCisgICAgICAgICogcGFn ZS9hbmltYXRpb24vQ1NTUHJvcGVydHlBbmltYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UHJvcGVydHlXcmFwcGVyU2hhZG93OjpibGVuZFNpbXBsZU9yTWF0Y2hlZFNoYWRvd0xpc3RzKToK KyAgICAgICAgKFdlYkNvcmU6OlByb3BlcnR5V3JhcHBlclNoYWRvdzo6YmxlbmRNaXNtYXRjaGVk U2hhZG93TGlzdHMpOgorCiAyMDEzLTA5LTA0ICBBbmRyZWkgQnVjdXIgIDxhYnVjdXJAYWRvYmUu Y29tPgogCiAgICAgICAgIFtDU1MgUmVnaW9uc10gRXh0ZW5kIHRoZSBSZW5kZXJSZWdpb25SYW5n ZSBjbGFzcyB0byBpbmNsdWRlIG92ZXJmbG93IGluZm9ybWF0aW9uICsgYXBwbHkgdGhlIGxheW91 dCBvdmVyZmxvdwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQ1NT UHJvcGVydHlBbmltYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQ1NT UHJvcGVydHlBbmltYXRpb24uY3BwCmluZGV4IDdkMmE1MzguLjAwOGY3OWEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NTU1Byb3BlcnR5QW5pbWF0aW9uLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9DU1NQcm9wZXJ0eUFuaW1hdGlvbi5j cHAKQEAgLTY1NCw3ICs2NTQsNyBAQCBwdWJsaWM6CiAgICAgfQogCiBwcml2YXRlOgotICAgIFBh c3NPd25QdHI8U2hhZG93RGF0YSo+IGJsZW5kU2ltcGxlT3JNYXRjaGVkU2hhZG93TGlzdHMoY29u c3QgQW5pbWF0aW9uQmFzZSogYW5pbSwgZG91YmxlIHByb2dyZXNzLCBjb25zdCBTaGFkb3dEYXRh KiBzaGFkb3dBLCBjb25zdCBTaGFkb3dEYXRhKiBzaGFkb3dCKSBjb25zdAorICAgIFBhc3NPd25Q dHI8U2hhZG93RGF0YT4gYmxlbmRTaW1wbGVPck1hdGNoZWRTaGFkb3dMaXN0cyhjb25zdCBBbmlt YXRpb25CYXNlKiBhbmltLCBkb3VibGUgcHJvZ3Jlc3MsIGNvbnN0IFNoYWRvd0RhdGEqIHNoYWRv d0EsIGNvbnN0IFNoYWRvd0RhdGEqIHNoYWRvd0IpIGNvbnN0CiAgICAgewogICAgICAgICBPd25Q dHI8U2hhZG93RGF0YT4gbmV3U2hhZG93RGF0YTsKICAgICAgICAgU2hhZG93RGF0YSogbGFzdFNo YWRvdyA9IDA7CkBAIC02ODAsNyArNjgwLDcgQEAgcHJpdmF0ZToKICAgICAgICAgcmV0dXJuIG5l d1NoYWRvd0RhdGEucmVsZWFzZSgpOwogICAgIH0KIAotICAgIFBhc3NPd25QdHI8U2hhZG93RGF0 YSo+IGJsZW5kTWlzbWF0Y2hlZFNoYWRvd0xpc3RzKGNvbnN0IEFuaW1hdGlvbkJhc2UqIGFuaW0s IGRvdWJsZSBwcm9ncmVzcywgY29uc3QgU2hhZG93RGF0YSogc2hhZG93QSwgY29uc3QgU2hhZG93 RGF0YSogc2hhZG93QiwgaW50IGZyb21MZW5ndGgsIGludCB0b0xlbmd0aCkgY29uc3QKKyAgICBQ YXNzT3duUHRyPFNoYWRvd0RhdGE+IGJsZW5kTWlzbWF0Y2hlZFNoYWRvd0xpc3RzKGNvbnN0IEFu aW1hdGlvbkJhc2UqIGFuaW0sIGRvdWJsZSBwcm9ncmVzcywgY29uc3QgU2hhZG93RGF0YSogc2hh ZG93QSwgY29uc3QgU2hhZG93RGF0YSogc2hhZG93QiwgaW50IGZyb21MZW5ndGgsIGludCB0b0xl bmd0aCkgY29uc3QKICAgICB7CiAgICAgICAgIC8vIFRoZSBzaGFkb3dzIGluIFNoYWRvd0RhdGEg YXJlIHN0b3JlZCBpbiByZXZlcnNlIG9yZGVyLCBzbyB3aGVuIGFuaW1hdGluZyBtaXNtYXRjaGVk IGxpc3RzLAogICAgICAgICAvLyByZXZlcnNlIHRoZW0gYW5kIG1hdGNoIGZyb20gdGhlIGVuZC4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAwMzE4YTI4Li5kNTliZjc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTMtMDktMDUgIE1pa2hhaWwgUG96ZG55YWtvdiAgPG1pa2hhaWwucG96ZG55YWtvdkBp bnRlbC5jb20+CisKKyAgICAgICAgV1RGOjpPd25QdHIgc2hvdWxkIGJlaGF2ZSBzaW1pbGFybHkg d2l0aCB0aGUgcmVzdCBvZiBXVEYgc21hcnQgcG9pbnRlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMDc3MworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgQmVmb3JlIHRoZSBjaGFuZ2UgT3duUHRyIGNvdWxk IHRha2UgZWl0aGVyIHRoZSBwb2ludGVyIHR5cGUgb3IgdGhlIHBvaW50ZWQtdG8gdHlwZSwgd2hp Y2ggd2FzIGJhZAorICAgICAgIGZvciB0aGUgZm9sbG93aW5nIHJlYXNvbnM6CisgICAgICAgLSBJ dCBkaXN0aW5ndWlzaGVkIE93blB0ciBiZWhhdmlvdXIgZnJvbSBvdGhlciBXVEYgc21hcnQgcG9p bnRlciBjbGFzc2VzIGJlaGF2aW91ciAoc28gaXQgd2FzIGNvbmZ1c2luZyBmb3IgdGhlIENsaWVu dCkuCisgICAgICAgLSBJdCB3YXMgcG90ZW50aWFsIGVycm9yLXByb25lIGFzIGl0IGFjdHVhbGx5 IG1vZGlmaWVkIHRoZSB0eXBlIGdpdmVuIGJ5IHRoZSBDbGllbnQgaW4gb3BhcXVlIHdheS4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19kYXRhYmFzZV9tYW5hZ2VyLmNwcDoKKyAg ICAgICAgKGdldERhdGFiYXNlT3JpZ2luc0NhbGxiYWNrKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL2VmbC9ld2tfc3RvcmFnZV9tYW5hZ2VyLmNwcDoKKyAgICAgICAgKGdldFN0b3JhZ2VPcmln aW5zQ2FsbGJhY2spOgorCiAyMDEzLTA5LTAzICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNv bT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMTU0OTY3KSB3aW5kb3cgcmVzaXplIGlzIHZlcnkg Y2hvcHB5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tf ZGF0YWJhc2VfbWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9l d2tfZGF0YWJhc2VfbWFuYWdlci5jcHAKaW5kZXggMjAxNTU0MS4uOTI5M2RlMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2RhdGFiYXNlX21hbmFnZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19kYXRhYmFzZV9t YW5hZ2VyLmNwcApAQCAtNzcsNyArNzcsNyBAQCBzdHJ1Y3QgRXdrX0RhdGFiYXNlX09yaWdpbnNf QXN5bmNfR2V0X0NvbnRleHQgewogCiBzdGF0aWMgdm9pZCBnZXREYXRhYmFzZU9yaWdpbnNDYWxs YmFjayhXS0FycmF5UmVmIG9yaWdpbnMsIFdLRXJyb3JSZWYgd2tFcnJvciwgdm9pZCogY29udGV4 dCkKIHsKLSAgICBPd25QdHI8RXdrX0RhdGFiYXNlX09yaWdpbnNfQXN5bmNfR2V0X0NvbnRleHQq PiB3ZWJEYXRhYmFzZUNvbnRleHQgPSBhZG9wdFB0cihzdGF0aWNfY2FzdDxFd2tfRGF0YWJhc2Vf T3JpZ2luc19Bc3luY19HZXRfQ29udGV4dCo+KGNvbnRleHQpKTsKKyAgICBPd25QdHI8RXdrX0Rh dGFiYXNlX09yaWdpbnNfQXN5bmNfR2V0X0NvbnRleHQ+IHdlYkRhdGFiYXNlQ29udGV4dCA9IGFk b3B0UHRyKHN0YXRpY19jYXN0PEV3a19EYXRhYmFzZV9PcmlnaW5zX0FzeW5jX0dldF9Db250ZXh0 Kj4oY29udGV4dCkpOwogICAgIEVpbmFfTGlzdCogb3JpZ2luTGlzdCA9IHdlYkRhdGFiYXNlQ29u dGV4dC0+bWFuYWdlci0+Y3JlYXRlT3JpZ2luTGlzdChvcmlnaW5zKTsKICAgICBPd25QdHI8RXdr RXJyb3I+IGV3a0Vycm9yID0gRXdrRXJyb3I6OmNyZWF0ZSh3a0Vycm9yKTsKICAgICB3ZWJEYXRh YmFzZUNvbnRleHQtPmNhbGxiYWNrKG9yaWdpbkxpc3QsIGV3a0Vycm9yLmdldCgpLCB3ZWJEYXRh YmFzZUNvbnRleHQtPnVzZXJEYXRhKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a19zdG9yYWdlX21hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3N0b3JhZ2VfbWFuYWdlci5jcHAKaW5kZXggZmQwZWFlYi4uY2E5 MjVmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3N0 b3JhZ2VfbWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX3N0b3JhZ2VfbWFuYWdlci5jcHAKQEAgLTc4LDcgKzc4LDcgQEAgc3RydWN0IEV3a19TdG9y YWdlX09yaWdpbnNfQXN5bmNfR2V0X0NvbnRleHQgewogc3RhdGljIHZvaWQgZ2V0U3RvcmFnZU9y aWdpbnNDYWxsYmFjayhXS0FycmF5UmVmIG9yaWdpbnMsIFdLRXJyb3JSZWYgd2tFcnJvciwgdm9p ZCogY29udGV4dCkKIHsKICAgICBFaW5hX0xpc3QqIG9yaWdpbkxpc3QgPSAwOwotICAgIE93blB0 cjxFd2tfU3RvcmFnZV9PcmlnaW5zX0FzeW5jX0dldF9Db250ZXh0Kj4gd2ViU3RvcmFnZUNvbnRl eHQgPSBhZG9wdFB0cihzdGF0aWNfY2FzdDxFd2tfU3RvcmFnZV9PcmlnaW5zX0FzeW5jX0dldF9D b250ZXh0Kj4oY29udGV4dCkpOworICAgIE93blB0cjxFd2tfU3RvcmFnZV9PcmlnaW5zX0FzeW5j X0dldF9Db250ZXh0PiB3ZWJTdG9yYWdlQ29udGV4dCA9IGFkb3B0UHRyKHN0YXRpY19jYXN0PEV3 a19TdG9yYWdlX09yaWdpbnNfQXN5bmNfR2V0X0NvbnRleHQqPihjb250ZXh0KSk7CiAKICAgICBv cmlnaW5MaXN0ID0gd2ViU3RvcmFnZUNvbnRleHQtPm1hbmFnZXItPmNyZWF0ZU9yaWdpbkxpc3Qo b3JpZ2lucyk7CiAK 210625 2013-09-05 09:13:56 -0700 2013-09-11 01:43:57 -0700 try fix Win bug120767_v2 text/plain 10574 mikhail.pozdnyakov Y29tbWl0IDhjNjg4YjY3MDA2N2UzNDdhNDc2MWVkYTk0YTRiNGQ5OTI0YTVmODIKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg VGh1IFNlcCA1IDE4OjAwOjEzIDIwMTMgKzAzMDAKCiAgICBidWcxMjA3NjcKCmRpZmYgLS1naXQg YS9Tb3VyY2UvV1RGL0NoYW5nZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGI2Mzlj OGYuLjJmNDk1YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAKIDIwMTMtMDktMDUgIE1pa2hhaWwgUG96 ZG55YWtvdiAgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CiAKKyAgICAgICAgV1RGOjpP d25QdHIgc2hvdWxkIGJlaGF2ZSBzaW1pbGFybHkgd2l0aCB0aGUgcmVzdCBvZiBXVEYgc21hcnQg cG9pbnRlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyMDc3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg QmVmb3JlIHRoZSBjaGFuZ2UgT3duUHRyIGNvdWxkIHRha2UgZWl0aGVyIHRoZSBwb2ludGVyIHR5 cGUgb3IgdGhlIHBvaW50ZWQtdG8gdHlwZSwgd2hpY2ggd2FzIGJhZAorICAgICAgIGZvciB0aGUg Zm9sbG93aW5nIHJlYXNvbnM6CisgICAgICAgLSBJdCBkaXN0aW5ndWlzaGVkIE93blB0ciBiZWhh dmlvdXIgZnJvbSBvdGhlciBXVEYgc21hcnQgcG9pbnRlciBjbGFzc2VzIGJlaGF2aW91ciAoc28g aXQgd2FzIGNvbmZ1c2luZyBmb3IgdGhlIENsaWVudCkuCisgICAgICAgLSBJdCB3YXMgcG90ZW50 aWFsIGVycm9yLXByb25lIGFzIGl0IGFjdHVhbGx5IG1vZGlmaWVkIHRoZSB0eXBlIGdpdmVuIGJ5 IHRoZSBDbGllbnQgaW4gb3BhcXVlIHdheS4KKworICAgICAgICAqIHd0Zi9Pd25QdHIuaDoKKyAg ICAgICAgKiB3dGYvUGFzc093blB0ci5oOgorCisyMDEzLTA5LTA1ICBNaWtoYWlsIFBvemRueWFr b3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgorCiAgICAgICAgIFJlbW92ZSBTdHJp bmcoUmVmUHRyPFN0cmluZ0ltcGw+KSBjb25zdHJ1Y3RvcgogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIwNzY3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X VEYvd3RmL093blB0ci5oIGIvU291cmNlL1dURi93dGYvT3duUHRyLmgKaW5kZXggZmE3OWFhMS4u MGNmZGJhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvT3duUHRyLmgKKysrIGIvU291cmNl L1dURi93dGYvT3duUHRyLmgKQEAgLTMxLDggKzMxLDYgQEAKIAogbmFtZXNwYWNlIFdURiB7CiAK LSAgICAvLyBVbmxpa2UgbW9zdCBvZiBvdXIgc21hcnQgcG9pbnRlcnMsIE93blB0ciBjYW4gdGFr ZSBlaXRoZXIgdGhlIHBvaW50ZXIgdHlwZSBvciB0aGUgcG9pbnRlZC10byB0eXBlLgotCiAgICAg dGVtcGxhdGU8dHlwZW5hbWUgVD4gY2xhc3MgUGFzc093blB0cjsKICAgICB0ZW1wbGF0ZTx0eXBl bmFtZSBUPiBQYXNzT3duUHRyPFQ+IGFkb3B0UHRyKFQqKTsKIApAQCAtNDMsNyArNDEsNyBAQCBu YW1lc3BhY2UgV1RGIHsKICAgICAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoT3duUHRyKTsKICNl bmRpZgogICAgIHB1YmxpYzoKLSAgICAgICAgdHlwZWRlZiB0eXBlbmFtZSBSZW1vdmVQb2ludGVy PFQ+OjpUeXBlIFZhbHVlVHlwZTsKKyAgICAgICAgdHlwZWRlZiBUIFZhbHVlVHlwZTsKICAgICAg ICAgdHlwZWRlZiBWYWx1ZVR5cGUqIFB0clR5cGU7CiAKICAgICAgICAgT3duUHRyKCkgOiBtX3B0 cigwKSB7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL093blB0ckNvbW1vbi5oIGIvU291 cmNlL1dURi93dGYvT3duUHRyQ29tbW9uLmgKaW5kZXggOWFjNjEzZi4uMWVjODdiMyAxMDA2NDQK LS0tIGEvU291cmNlL1dURi93dGYvT3duUHRyQ29tbW9uLmgKKysrIGIvU291cmNlL1dURi93dGYv T3duUHRyQ29tbW9uLmgKQEAgLTI5LDEzICsyOSwxMyBAQAogI2RlZmluZSBXVEZfT3duUHRyQ29t bW9uX2gKIAogI2lmIE9TKFdJTkRPV1MpCi10eXBlZGVmIHN0cnVjdCBIQklUTUFQX18qIEhCSVRN QVA7Ci10eXBlZGVmIHN0cnVjdCBIQlJVU0hfXyogSEJSVVNIOwotdHlwZWRlZiBzdHJ1Y3QgSERD X18qIEhEQzsKLXR5cGVkZWYgc3RydWN0IEhGT05UX18qIEhGT05UOwotdHlwZWRlZiBzdHJ1Y3Qg SFBBTEVUVEVfXyogSFBBTEVUVEU7Ci10eXBlZGVmIHN0cnVjdCBIUEVOX18qIEhQRU47Ci10eXBl ZGVmIHN0cnVjdCBIUkdOX18qIEhSR047Cit0eXBlZGVmIHN0cnVjdCBIQklUTUFQX18gSEJJVE1B UDsKK3R5cGVkZWYgc3RydWN0IEhCUlVTSF9fIEhCUlVTSDsKK3R5cGVkZWYgc3RydWN0IEhEQ19f IEhEQzsKK3R5cGVkZWYgc3RydWN0IEhGT05UX18gSEZPTlQ7Cit0eXBlZGVmIHN0cnVjdCBIUEFM RVRURV9fIEhQQUxFVFRFOwordHlwZWRlZiBzdHJ1Y3QgSFBFTl9fIEhQRU47Cit0eXBlZGVmIHN0 cnVjdCBIUkdOX18gSFJHTjsKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oRUZMKQpAQCAtNjQsMTMg KzY0LDEzIEBAIG5hbWVzcGFjZSBXVEYgewogICAgIH0KIAogI2lmIE9TKFdJTkRPV1MpCi0gICAg V1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgZGVsZXRlT3duZWRQdHIoSEJJVE1BUCk7Ci0gICAgV1RG X0VYUE9SVF9QUklWQVRFIHZvaWQgZGVsZXRlT3duZWRQdHIoSEJSVVNIKTsKLSAgICBXVEZfRVhQ T1JUX1BSSVZBVEUgdm9pZCBkZWxldGVPd25lZFB0cihIREMpOwotICAgIFdURl9FWFBPUlRfUFJJ VkFURSB2b2lkIGRlbGV0ZU93bmVkUHRyKEhGT05UKTsKLSAgICBXVEZfRVhQT1JUX1BSSVZBVEUg dm9pZCBkZWxldGVPd25lZFB0cihIUEFMRVRURSk7Ci0gICAgV1RGX0VYUE9SVF9QUklWQVRFIHZv aWQgZGVsZXRlT3duZWRQdHIoSFBFTik7Ci0gICAgV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgZGVs ZXRlT3duZWRQdHIoSFJHTik7CisgICAgV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgZGVsZXRlT3du ZWRQdHIoSEJJVE1BUCopOworICAgIFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIGRlbGV0ZU93bmVk UHRyKEhCUlVTSCopOworICAgIFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIGRlbGV0ZU93bmVkUHRy KEhEQyopOworICAgIFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIGRlbGV0ZU93bmVkUHRyKEhGT05U Kik7CisgICAgV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgZGVsZXRlT3duZWRQdHIoSFBBTEVUVEUq KTsKKyAgICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBkZWxldGVPd25lZFB0cihIUEVOKik7Cisg ICAgV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgZGVsZXRlT3duZWRQdHIoSFJHTiopOwogI2VuZGlm CiAKICNpZiBQTEFURk9STShFRkwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9QYXNzT3du UHRyLmggYi9Tb3VyY2UvV1RGL3d0Zi9QYXNzT3duUHRyLmgKaW5kZXggY2I4NzUzOS4uMTg2YmIz NyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvUGFzc093blB0ci5oCisrKyBiL1NvdXJjZS9X VEYvd3RmL1Bhc3NPd25QdHIuaApAQCAtMzMsOCArMzMsNiBAQAogCiBuYW1lc3BhY2UgV1RGIHsK IAotICAgIC8vIFVubGlrZSBtb3N0IG9mIG91ciBzbWFydCBwb2ludGVycywgUGFzc093blB0ciBj YW4gdGFrZSBlaXRoZXIgdGhlIHBvaW50ZXIgdHlwZSBvciB0aGUgcG9pbnRlZC10byB0eXBlLgot CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gY2xhc3MgT3duUHRyOwogICAgIHRlbXBsYXRlPHR5 cGVuYW1lIFQ+IGNsYXNzIFBhc3NPd25QdHI7CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gUGFz c093blB0cjxUPiBhZG9wdFB0cihUKik7CkBAIC00NCw3ICs0Miw3IEBAIG5hbWVzcGFjZSBXVEYg ewogCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gY2xhc3MgUGFzc093blB0ciB7CiAgICAgcHVi bGljOgotICAgICAgICB0eXBlZGVmIHR5cGVuYW1lIFJlbW92ZVBvaW50ZXI8VD46OlR5cGUgVmFs dWVUeXBlOworICAgICAgICB0eXBlZGVmIFQgVmFsdWVUeXBlOwogICAgICAgICB0eXBlZGVmIFZh bHVlVHlwZSogUHRyVHlwZTsKIAogICAgICAgICBQYXNzT3duUHRyKCkgOiBtX3B0cigwKSB7IH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL3dpbi9Pd25QdHJXaW4uY3BwIGIvU291cmNlL1dU Ri93dGYvd2luL093blB0cldpbi5jcHAKaW5kZXggZDYyNWUyMC4uMmJmYjAwOCAxMDA2NDQKLS0t IGEvU291cmNlL1dURi93dGYvd2luL093blB0cldpbi5jcHAKKysrIGIvU291cmNlL1dURi93dGYv d2luL093blB0cldpbi5jcHAKQEAgLTMzLDQzICszMyw0MyBAQAogCiBuYW1lc3BhY2UgV1RGIHsK IAotdm9pZCBkZWxldGVPd25lZFB0cihIQklUTUFQIHB0cikKK3ZvaWQgZGVsZXRlT3duZWRQdHIo SEJJVE1BUCogcHRyKQogewogICAgIGlmIChwdHIpCiAgICAgICAgIERlbGV0ZU9iamVjdChwdHIp OwogfQogCi12b2lkIGRlbGV0ZU93bmVkUHRyKEhCUlVTSCBwdHIpCit2b2lkIGRlbGV0ZU93bmVk UHRyKEhCUlVTSCogcHRyKQogewogICAgIGlmIChwdHIpCiAgICAgICAgIERlbGV0ZU9iamVjdChw dHIpOwogfQogCi12b2lkIGRlbGV0ZU93bmVkUHRyKEhEQyBwdHIpCit2b2lkIGRlbGV0ZU93bmVk UHRyKEhEQyogcHRyKQogewogICAgIGlmIChwdHIpCiAgICAgICAgIERlbGV0ZURDKHB0cik7CiB9 CiAKLXZvaWQgZGVsZXRlT3duZWRQdHIoSEZPTlQgcHRyKQordm9pZCBkZWxldGVPd25lZFB0cihI Rk9OVCogcHRyKQogewogICAgIGlmIChwdHIpCiAgICAgICAgIERlbGV0ZU9iamVjdChwdHIpOwog fQogCi12b2lkIGRlbGV0ZU93bmVkUHRyKEhQQUxFVFRFIHB0cikKK3ZvaWQgZGVsZXRlT3duZWRQ dHIoSFBBTEVUVEUqIHB0cikKIHsKICAgICBpZiAocHRyKQogICAgICAgICBEZWxldGVPYmplY3Qo cHRyKTsKIH0KIAotdm9pZCBkZWxldGVPd25lZFB0cihIUEVOIHB0cikKK3ZvaWQgZGVsZXRlT3du ZWRQdHIoSFBFTiogcHRyKQogewogICAgIGlmIChwdHIpCiAgICAgICAgIERlbGV0ZU9iamVjdChw dHIpOwogfQogCi12b2lkIGRlbGV0ZU93bmVkUHRyKEhSR04gcHRyKQordm9pZCBkZWxldGVPd25l ZFB0cihIUkdOKiBwdHIpCiB7CiAgICAgaWYgKHB0cikKICAgICAgICAgRGVsZXRlT2JqZWN0KHB0 cik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKaW5kZXggNWQ5Y2M1ZS4uZjQzMTQyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE5IEBACisyMDEzLTA5LTA1ICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFr b3ZAaW50ZWwuY29tPgorCisgICAgICAgIFdURjo6T3duUHRyIHNob3VsZCBiZWhhdmUgc2ltaWxh cmx5IHdpdGggdGhlIHJlc3Qgb2YgV1RGIHNtYXJ0IHBvaW50ZXJzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjA3NzMKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgIEJlZm9yZSB0aGUgY2hhbmdlIE93blB0ciBj b3VsZCB0YWtlIGVpdGhlciB0aGUgcG9pbnRlciB0eXBlIG9yIHRoZSBwb2ludGVkLXRvIHR5cGUs IHdoaWNoIHdhcyBiYWQKKyAgICAgICBmb3IgdGhlIGZvbGxvd2luZyByZWFzb25zOgorICAgICAg IC0gSXQgZGlzdGluZ3Vpc2hlZCBPd25QdHIgYmVoYXZpb3VyIGZyb20gb3RoZXIgV1RGIHNtYXJ0 IHBvaW50ZXIgY2xhc3NlcyBiZWhhdmlvdXIgKHNvIGl0IHdhcyBjb25mdXNpbmcgZm9yIHRoZSBD bGllbnQpLgorICAgICAgIC0gSXQgd2FzIHBvdGVudGlhbCBlcnJvci1wcm9uZSBhcyBpdCBhY3R1 YWxseSBtb2RpZmllZCB0aGUgdHlwZSBnaXZlbiBieSB0aGUgQ2xpZW50IGluIG9wYXF1ZSB3YXku CisKKyAgICAgICAgKiBwYWdlL2FuaW1hdGlvbi9DU1NQcm9wZXJ0eUFuaW1hdGlvbi5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpQcm9wZXJ0eVdyYXBwZXJTaGFkb3c6OmJsZW5kU2ltcGxlT3JNYXRj aGVkU2hhZG93TGlzdHMpOgorICAgICAgICAoV2ViQ29yZTo6UHJvcGVydHlXcmFwcGVyU2hhZG93 OjpibGVuZE1pc21hdGNoZWRTaGFkb3dMaXN0cyk6CisKIDIwMTMtMDktMDQgIEFuZHJlaSBCdWN1 ciAgPGFidWN1ckBhZG9iZS5jb20+CiAKICAgICAgICAgW0NTUyBSZWdpb25zXSBFeHRlbmQgdGhl IFJlbmRlclJlZ2lvblJhbmdlIGNsYXNzIHRvIGluY2x1ZGUgb3ZlcmZsb3cgaW5mb3JtYXRpb24g KyBhcHBseSB0aGUgbGF5b3V0IG92ZXJmbG93CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL2FuaW1hdGlvbi9DU1NQcm9wZXJ0eUFuaW1hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL2FuaW1hdGlvbi9DU1NQcm9wZXJ0eUFuaW1hdGlvbi5jcHAKaW5kZXggN2QyYTUzOC4uMDA4 Zjc5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9hbmltYXRpb24vQ1NTUHJvcGVy dHlBbmltYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NTU1By b3BlcnR5QW5pbWF0aW9uLmNwcApAQCAtNjU0LDcgKzY1NCw3IEBAIHB1YmxpYzoKICAgICB9CiAK IHByaXZhdGU6Ci0gICAgUGFzc093blB0cjxTaGFkb3dEYXRhKj4gYmxlbmRTaW1wbGVPck1hdGNo ZWRTaGFkb3dMaXN0cyhjb25zdCBBbmltYXRpb25CYXNlKiBhbmltLCBkb3VibGUgcHJvZ3Jlc3Ms IGNvbnN0IFNoYWRvd0RhdGEqIHNoYWRvd0EsIGNvbnN0IFNoYWRvd0RhdGEqIHNoYWRvd0IpIGNv bnN0CisgICAgUGFzc093blB0cjxTaGFkb3dEYXRhPiBibGVuZFNpbXBsZU9yTWF0Y2hlZFNoYWRv d0xpc3RzKGNvbnN0IEFuaW1hdGlvbkJhc2UqIGFuaW0sIGRvdWJsZSBwcm9ncmVzcywgY29uc3Qg U2hhZG93RGF0YSogc2hhZG93QSwgY29uc3QgU2hhZG93RGF0YSogc2hhZG93QikgY29uc3QKICAg ICB7CiAgICAgICAgIE93blB0cjxTaGFkb3dEYXRhPiBuZXdTaGFkb3dEYXRhOwogICAgICAgICBT aGFkb3dEYXRhKiBsYXN0U2hhZG93ID0gMDsKQEAgLTY4MCw3ICs2ODAsNyBAQCBwcml2YXRlOgog ICAgICAgICByZXR1cm4gbmV3U2hhZG93RGF0YS5yZWxlYXNlKCk7CiAgICAgfQogCi0gICAgUGFz c093blB0cjxTaGFkb3dEYXRhKj4gYmxlbmRNaXNtYXRjaGVkU2hhZG93TGlzdHMoY29uc3QgQW5p bWF0aW9uQmFzZSogYW5pbSwgZG91YmxlIHByb2dyZXNzLCBjb25zdCBTaGFkb3dEYXRhKiBzaGFk b3dBLCBjb25zdCBTaGFkb3dEYXRhKiBzaGFkb3dCLCBpbnQgZnJvbUxlbmd0aCwgaW50IHRvTGVu Z3RoKSBjb25zdAorICAgIFBhc3NPd25QdHI8U2hhZG93RGF0YT4gYmxlbmRNaXNtYXRjaGVkU2hh ZG93TGlzdHMoY29uc3QgQW5pbWF0aW9uQmFzZSogYW5pbSwgZG91YmxlIHByb2dyZXNzLCBjb25z dCBTaGFkb3dEYXRhKiBzaGFkb3dBLCBjb25zdCBTaGFkb3dEYXRhKiBzaGFkb3dCLCBpbnQgZnJv bUxlbmd0aCwgaW50IHRvTGVuZ3RoKSBjb25zdAogICAgIHsKICAgICAgICAgLy8gVGhlIHNoYWRv d3MgaW4gU2hhZG93RGF0YSBhcmUgc3RvcmVkIGluIHJldmVyc2Ugb3JkZXIsIHNvIHdoZW4gYW5p bWF0aW5nIG1pc21hdGNoZWQgbGlzdHMsCiAgICAgICAgIC8vIHJldmVyc2UgdGhlbSBhbmQgbWF0 Y2ggZnJvbSB0aGUgZW5kLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDAzMThhMjguLmQ1OWJmNzggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMy0wOS0wNSAgTWlraGFpbCBQb3pkbnlha292ICA8bWlr aGFpbC5wb3pkbnlha292QGludGVsLmNvbT4KKworICAgICAgICBXVEY6Ok93blB0ciBzaG91bGQg YmVoYXZlIHNpbWlsYXJseSB3aXRoIHRoZSByZXN0IG9mIFdURiBzbWFydCBwb2ludGVycworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIwNzczCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICBCZWZvcmUgdGhlIGNo YW5nZSBPd25QdHIgY291bGQgdGFrZSBlaXRoZXIgdGhlIHBvaW50ZXIgdHlwZSBvciB0aGUgcG9p bnRlZC10byB0eXBlLCB3aGljaCB3YXMgYmFkCisgICAgICAgZm9yIHRoZSBmb2xsb3dpbmcgcmVh c29uczoKKyAgICAgICAtIEl0IGRpc3Rpbmd1aXNoZWQgT3duUHRyIGJlaGF2aW91ciBmcm9tIG90 aGVyIFdURiBzbWFydCBwb2ludGVyIGNsYXNzZXMgYmVoYXZpb3VyIChzbyBpdCB3YXMgY29uZnVz aW5nIGZvciB0aGUgQ2xpZW50KS4KKyAgICAgICAtIEl0IHdhcyBwb3RlbnRpYWwgZXJyb3ItcHJv bmUgYXMgaXQgYWN0dWFsbHkgbW9kaWZpZWQgdGhlIHR5cGUgZ2l2ZW4gYnkgdGhlIENsaWVudCBp biBvcGFxdWUgd2F5LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2RhdGFiYXNl X21hbmFnZXIuY3BwOgorICAgICAgICAoZ2V0RGF0YWJhc2VPcmlnaW5zQ2FsbGJhY2spOgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19zdG9yYWdlX21hbmFnZXIuY3BwOgorICAgICAg ICAoZ2V0U3RvcmFnZU9yaWdpbnNDYWxsYmFjayk6CisKIDIwMTMtMDktMDMgIERhcmluIEFkbGVy ICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIxNTQ5NjcpIHdpbmRv dyByZXNpemUgaXMgdmVyeSBjaG9wcHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a19kYXRhYmFzZV9tYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a19kYXRhYmFzZV9tYW5hZ2VyLmNwcAppbmRleCAyMDE1NTQxLi45 MjkzZGUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tf ZGF0YWJhc2VfbWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2RhdGFiYXNlX21hbmFnZXIuY3BwCkBAIC03Nyw3ICs3Nyw3IEBAIHN0cnVjdCBFd2tf RGF0YWJhc2VfT3JpZ2luc19Bc3luY19HZXRfQ29udGV4dCB7CiAKIHN0YXRpYyB2b2lkIGdldERh dGFiYXNlT3JpZ2luc0NhbGxiYWNrKFdLQXJyYXlSZWYgb3JpZ2lucywgV0tFcnJvclJlZiB3a0Vy cm9yLCB2b2lkKiBjb250ZXh0KQogewotICAgIE93blB0cjxFd2tfRGF0YWJhc2VfT3JpZ2luc19B c3luY19HZXRfQ29udGV4dCo+IHdlYkRhdGFiYXNlQ29udGV4dCA9IGFkb3B0UHRyKHN0YXRpY19j YXN0PEV3a19EYXRhYmFzZV9PcmlnaW5zX0FzeW5jX0dldF9Db250ZXh0Kj4oY29udGV4dCkpOwor ICAgIE93blB0cjxFd2tfRGF0YWJhc2VfT3JpZ2luc19Bc3luY19HZXRfQ29udGV4dD4gd2ViRGF0 YWJhc2VDb250ZXh0ID0gYWRvcHRQdHIoc3RhdGljX2Nhc3Q8RXdrX0RhdGFiYXNlX09yaWdpbnNf QXN5bmNfR2V0X0NvbnRleHQqPihjb250ZXh0KSk7CiAgICAgRWluYV9MaXN0KiBvcmlnaW5MaXN0 ID0gd2ViRGF0YWJhc2VDb250ZXh0LT5tYW5hZ2VyLT5jcmVhdGVPcmlnaW5MaXN0KG9yaWdpbnMp OwogICAgIE93blB0cjxFd2tFcnJvcj4gZXdrRXJyb3IgPSBFd2tFcnJvcjo6Y3JlYXRlKHdrRXJy b3IpOwogICAgIHdlYkRhdGFiYXNlQ29udGV4dC0+Y2FsbGJhY2sob3JpZ2luTGlzdCwgZXdrRXJy b3IuZ2V0KCksIHdlYkRhdGFiYXNlQ29udGV4dC0+dXNlckRhdGEpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3N0b3JhZ2VfbWFuYWdlci5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfc3RvcmFnZV9tYW5hZ2VyLmNwcApp bmRleCBmZDBlYWViLi5jYTkyNWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfc3RvcmFnZV9tYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfc3RvcmFnZV9tYW5hZ2VyLmNwcApAQCAtNzgsNyArNzgsNyBA QCBzdHJ1Y3QgRXdrX1N0b3JhZ2VfT3JpZ2luc19Bc3luY19HZXRfQ29udGV4dCB7CiBzdGF0aWMg dm9pZCBnZXRTdG9yYWdlT3JpZ2luc0NhbGxiYWNrKFdLQXJyYXlSZWYgb3JpZ2lucywgV0tFcnJv clJlZiB3a0Vycm9yLCB2b2lkKiBjb250ZXh0KQogewogICAgIEVpbmFfTGlzdCogb3JpZ2luTGlz dCA9IDA7Ci0gICAgT3duUHRyPEV3a19TdG9yYWdlX09yaWdpbnNfQXN5bmNfR2V0X0NvbnRleHQq PiB3ZWJTdG9yYWdlQ29udGV4dCA9IGFkb3B0UHRyKHN0YXRpY19jYXN0PEV3a19TdG9yYWdlX09y aWdpbnNfQXN5bmNfR2V0X0NvbnRleHQqPihjb250ZXh0KSk7CisgICAgT3duUHRyPEV3a19TdG9y YWdlX09yaWdpbnNfQXN5bmNfR2V0X0NvbnRleHQ+IHdlYlN0b3JhZ2VDb250ZXh0ID0gYWRvcHRQ dHIoc3RhdGljX2Nhc3Q8RXdrX1N0b3JhZ2VfT3JpZ2luc19Bc3luY19HZXRfQ29udGV4dCo+KGNv bnRleHQpKTsKIAogICAgIG9yaWdpbkxpc3QgPSB3ZWJTdG9yYWdlQ29udGV4dC0+bWFuYWdlci0+ Y3JlYXRlT3JpZ2luTGlzdChvcmlnaW5zKTsKIAo= 211290 2013-09-11 01:43:57 -0700 2013-09-11 07:42:02 -0700 rebased bug120773_v3 text/plain 7814 mikhail.pozdnyakov Y29tbWl0IDdiN2JhMDMxOTM0NzdkNTJmOTFjYzZjZDBmMDcyNjkwOGRkODVlZWUKQXV0aG9yOiBN aWtoYWlsIFBvemRueWFrb3YgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CkRhdGU6ICAg VGh1IFNlcCA1IDE4OjAwOjEzIDIwMTMgKzAzMDAKCiAgICBidWcxMjA3NjcKCmRpZmYgLS1naXQg YS9Tb3VyY2UvV1RGL0NoYW5nZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDMwMDJi NzkuLjFiMmNmN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTMtMDktMTEgIE1pa2hhaWwgUG96 ZG55YWtvdiAgPG1pa2hhaWwucG96ZG55YWtvdkBpbnRlbC5jb20+CisKKyAgICAgICAgV1RGOjpP d25QdHIgc2hvdWxkIGJlaGF2ZSBzaW1pbGFybHkgd2l0aCB0aGUgcmVzdCBvZiBXVEYgc21hcnQg cG9pbnRlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyMDc3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEJlZm9yZSB0aGUgY2hhbmdlIE93blB0ciBjb3VsZCB0YWtlIGVpdGhlciB0aGUgcG9pbnRlciB0 eXBlIG9yIHRoZSBwb2ludGVkLXRvIHR5cGUsIHdoaWNoIHdhcyBiYWQKKyAgICAgICAgZm9yIHRo ZSBmb2xsb3dpbmcgcmVhc29uczoKKyAgICAgICAgLSBJdCBkaXN0aW5ndWlzaGVkIE93blB0ciBi ZWhhdmlvdXIgZnJvbSBvdGhlciBXVEYgc21hcnQgcG9pbnRlciBjbGFzc2VzIGJlaGF2aW91ciAo c28gaXQgd2FzIGNvbmZ1c2luZyBmb3IgdGhlIENsaWVudCkuCisgICAgICAgIC0gSXQgd2FzIHBv dGVudGlhbCBlcnJvci1wcm9uZSBhcyBpdCBhY3R1YWxseSBtb2RpZmllZCB0aGUgdHlwZSBnaXZl biBieSB0aGUgQ2xpZW50IGluIG9wYXF1ZSB3YXkuCisKKyAgICAgICAgKiB3dGYvT3duUHRyLmg6 CisgICAgICAgICogd3RmL1Bhc3NPd25QdHIuaDoKKwogMjAxMy0wOS0xMCAgRGFuaWVsIEJhdGVz ICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gVXBzdHJlYW0gdGV4dCBhdXRv c2l6aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9Pd25QdHIuaCBiL1NvdXJjZS9XVEYv d3RmL093blB0ci5oCmluZGV4IDkyYTRiNDkuLjhhODUyODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X VEYvd3RmL093blB0ci5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL093blB0ci5oCkBAIC0zMCwxNCAr MzAsMTIgQEAKIAogbmFtZXNwYWNlIFdURiB7CiAKLSAgICAvLyBVbmxpa2UgbW9zdCBvZiBvdXIg c21hcnQgcG9pbnRlcnMsIE93blB0ciBjYW4gdGFrZSBlaXRoZXIgdGhlIHBvaW50ZXIgdHlwZSBv ciB0aGUgcG9pbnRlZC10byB0eXBlLgotCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gY2xhc3Mg UGFzc093blB0cjsKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBQYXNzT3duUHRyPFQ+IGFkb3B0 UHRyKFQqKTsKIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGNsYXNzIE93blB0ciB7CiAgICAg cHVibGljOgotICAgICAgICB0eXBlZGVmIHR5cGVuYW1lIHN0ZDo6cmVtb3ZlX3BvaW50ZXI8VD46 OnR5cGUgVmFsdWVUeXBlOworICAgICAgICB0eXBlZGVmIFQgVmFsdWVUeXBlOwogICAgICAgICB0 eXBlZGVmIFZhbHVlVHlwZSogUHRyVHlwZTsKIAogICAgICAgICBPd25QdHIoKSA6IG1fcHRyKDAp IHsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvUGFzc093blB0ci5oIGIvU291cmNlL1dU Ri93dGYvUGFzc093blB0ci5oCmluZGV4IDVhOGMzMjAuLjFkZWZiYjkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XVEYvd3RmL1Bhc3NPd25QdHIuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9QYXNzT3duUHRy LmgKQEAgLTMzLDggKzMzLDYgQEAKIAogbmFtZXNwYWNlIFdURiB7CiAKLSAgICAvLyBVbmxpa2Ug bW9zdCBvZiBvdXIgc21hcnQgcG9pbnRlcnMsIFBhc3NPd25QdHIgY2FuIHRha2UgZWl0aGVyIHRo ZSBwb2ludGVyIHR5cGUgb3IgdGhlIHBvaW50ZWQtdG8gdHlwZS4KLQogICAgIHRlbXBsYXRlPHR5 cGVuYW1lIFQ+IGNsYXNzIE93blB0cjsKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBjbGFzcyBQ YXNzT3duUHRyOwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IFBhc3NPd25QdHI8VD4gYWRvcHRQ dHIoVCopOwpAQCAtNDQsNyArNDIsNyBAQCBuYW1lc3BhY2UgV1RGIHsKIAogICAgIHRlbXBsYXRl PHR5cGVuYW1lIFQ+IGNsYXNzIFBhc3NPd25QdHIgewogICAgIHB1YmxpYzoKLSAgICAgICAgdHlw ZWRlZiB0eXBlbmFtZSBzdGQ6OnJlbW92ZV9wb2ludGVyPFQ+Ojp0eXBlIFZhbHVlVHlwZTsKKyAg ICAgICAgdHlwZWRlZiBUIFZhbHVlVHlwZTsKICAgICAgICAgdHlwZWRlZiBWYWx1ZVR5cGUqIFB0 clR5cGU7CiAKICAgICAgICAgUGFzc093blB0cigpIDogbV9wdHIoMCkgeyB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5k ZXggZTVmYTQ0My4uZWUxNTk3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTA5 LTA1ICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgor CisgICAgICAgIFdURjo6T3duUHRyIHNob3VsZCBiZWhhdmUgc2ltaWxhcmx5IHdpdGggdGhlIHJl c3Qgb2YgV1RGIHNtYXJ0IHBvaW50ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMjA3NzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBCZWZvcmUgdGhlIGNoYW5nZSBPd25QdHIgY291bGQgdGFrZSBlaXRo ZXIgdGhlIHBvaW50ZXIgdHlwZSBvciB0aGUgcG9pbnRlZC10byB0eXBlLCB3aGljaCB3YXMgYmFk CisgICAgICAgIGZvciB0aGUgZm9sbG93aW5nIHJlYXNvbnM6CisgICAgICAgIC0gSXQgZGlzdGlu Z3Vpc2hlZCBPd25QdHIgYmVoYXZpb3VyIGZyb20gb3RoZXIgV1RGIHNtYXJ0IHBvaW50ZXIgY2xh c3NlcyBiZWhhdmlvdXIgKHNvIGl0IHdhcyBjb25mdXNpbmcgZm9yIHRoZSBDbGllbnQpLgorICAg ICAgICAtIEl0IHdhcyBwb3RlbnRpYWwgZXJyb3ItcHJvbmUgYXMgaXQgYWN0dWFsbHkgbW9kaWZp ZWQgdGhlIHR5cGUgZ2l2ZW4gYnkgdGhlIENsaWVudCBpbiBvcGFxdWUgd2F5LgorCisgICAgICAg ICogcGFnZS9hbmltYXRpb24vQ1NTUHJvcGVydHlBbmltYXRpb24uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UHJvcGVydHlXcmFwcGVyU2hhZG93OjpibGVuZFNpbXBsZU9yTWF0Y2hlZFNoYWRvd0xp c3RzKToKKyAgICAgICAgKFdlYkNvcmU6OlByb3BlcnR5V3JhcHBlclNoYWRvdzo6YmxlbmRNaXNt YXRjaGVkU2hhZG93TGlzdHMpOgorCiAyMDEzLTA5LTEwICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVz QGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBVcHN0cmVhbSB0ZXh0IGF1dG9zaXppbmcKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NTU1Byb3BlcnR5QW5pbWF0 aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NTU1Byb3BlcnR5QW5pbWF0 aW9uLmNwcAppbmRleCAwOWY2MmE4Li40YjdjYmRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL2FuaW1hdGlvbi9DU1NQcm9wZXJ0eUFuaW1hdGlvbi5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9hbmltYXRpb24vQ1NTUHJvcGVydHlBbmltYXRpb24uY3BwCkBAIC02NzIsNyAr NjcyLDcgQEAgcHVibGljOgogICAgIH0KIAogcHJpdmF0ZToKLSAgICBQYXNzT3duUHRyPFNoYWRv d0RhdGEqPiBibGVuZFNpbXBsZU9yTWF0Y2hlZFNoYWRvd0xpc3RzKGNvbnN0IEFuaW1hdGlvbkJh c2UqIGFuaW0sIGRvdWJsZSBwcm9ncmVzcywgY29uc3QgU2hhZG93RGF0YSogc2hhZG93QSwgY29u c3QgU2hhZG93RGF0YSogc2hhZG93QikgY29uc3QKKyAgICBQYXNzT3duUHRyPFNoYWRvd0RhdGE+ IGJsZW5kU2ltcGxlT3JNYXRjaGVkU2hhZG93TGlzdHMoY29uc3QgQW5pbWF0aW9uQmFzZSogYW5p bSwgZG91YmxlIHByb2dyZXNzLCBjb25zdCBTaGFkb3dEYXRhKiBzaGFkb3dBLCBjb25zdCBTaGFk b3dEYXRhKiBzaGFkb3dCKSBjb25zdAogICAgIHsKICAgICAgICAgT3duUHRyPFNoYWRvd0RhdGE+ IG5ld1NoYWRvd0RhdGE7CiAgICAgICAgIFNoYWRvd0RhdGEqIGxhc3RTaGFkb3cgPSAwOwpAQCAt Njk4LDcgKzY5OCw3IEBAIHByaXZhdGU6CiAgICAgICAgIHJldHVybiBuZXdTaGFkb3dEYXRhLnJl bGVhc2UoKTsKICAgICB9CiAKLSAgICBQYXNzT3duUHRyPFNoYWRvd0RhdGEqPiBibGVuZE1pc21h dGNoZWRTaGFkb3dMaXN0cyhjb25zdCBBbmltYXRpb25CYXNlKiBhbmltLCBkb3VibGUgcHJvZ3Jl c3MsIGNvbnN0IFNoYWRvd0RhdGEqIHNoYWRvd0EsIGNvbnN0IFNoYWRvd0RhdGEqIHNoYWRvd0Is IGludCBmcm9tTGVuZ3RoLCBpbnQgdG9MZW5ndGgpIGNvbnN0CisgICAgUGFzc093blB0cjxTaGFk b3dEYXRhPiBibGVuZE1pc21hdGNoZWRTaGFkb3dMaXN0cyhjb25zdCBBbmltYXRpb25CYXNlKiBh bmltLCBkb3VibGUgcHJvZ3Jlc3MsIGNvbnN0IFNoYWRvd0RhdGEqIHNoYWRvd0EsIGNvbnN0IFNo YWRvd0RhdGEqIHNoYWRvd0IsIGludCBmcm9tTGVuZ3RoLCBpbnQgdG9MZW5ndGgpIGNvbnN0CiAg ICAgewogICAgICAgICAvLyBUaGUgc2hhZG93cyBpbiBTaGFkb3dEYXRhIGFyZSBzdG9yZWQgaW4g cmV2ZXJzZSBvcmRlciwgc28gd2hlbiBhbmltYXRpbmcgbWlzbWF0Y2hlZCBsaXN0cywKICAgICAg ICAgLy8gcmV2ZXJzZSB0aGVtIGFuZCBtYXRjaCBmcm9tIHRoZSBlbmQuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg NDQ0ZWE4OS4uNDZkYTQwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA5LTA1 ICBNaWtoYWlsIFBvemRueWFrb3YgIDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgorCisg ICAgICAgIFdURjo6T3duUHRyIHNob3VsZCBiZWhhdmUgc2ltaWxhcmx5IHdpdGggdGhlIHJlc3Qg b2YgV1RGIHNtYXJ0IHBvaW50ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjA3NzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBCZWZvcmUgdGhlIGNoYW5nZSBPd25QdHIgY291bGQgdGFrZSBlaXRoZXIg dGhlIHBvaW50ZXIgdHlwZSBvciB0aGUgcG9pbnRlZC10byB0eXBlLCB3aGljaCB3YXMgYmFkCisg ICAgICAgIGZvciB0aGUgZm9sbG93aW5nIHJlYXNvbnM6CisgICAgICAgIC0gSXQgZGlzdGluZ3Vp c2hlZCBPd25QdHIgYmVoYXZpb3VyIGZyb20gb3RoZXIgV1RGIHNtYXJ0IHBvaW50ZXIgY2xhc3Nl cyBiZWhhdmlvdXIgKHNvIGl0IHdhcyBjb25mdXNpbmcgZm9yIHRoZSBDbGllbnQpLgorICAgICAg ICAtIEl0IHdhcyBwb3RlbnRpYWwgZXJyb3ItcHJvbmUgYXMgaXQgYWN0dWFsbHkgbW9kaWZpZWQg dGhlIHR5cGUgZ2l2ZW4gYnkgdGhlIENsaWVudCBpbiBvcGFxdWUgd2F5LgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2RhdGFiYXNlX21hbmFnZXIuY3BwOgorICAgICAgICAoZ2V0 RGF0YWJhc2VPcmlnaW5zQ2FsbGJhY2spOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3 a19zdG9yYWdlX21hbmFnZXIuY3BwOgorICAgICAgICAoZ2V0U3RvcmFnZU9yaWdpbnNDYWxsYmFj ayk6CisKIDIwMTMtMDktMTAgIE1hcmNlbG8gTW9yYWlzICA8bS5tb3JhaXNAc2Ftc3VuZy5jb20+ CiAKICAgICAgICAgW0VGTF0gV2ViSW5zcGVjdG9yOiBNb3ZlIHRvIG5ldyB3ZWJpbnNwZWN0b3IK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19kYXRhYmFz ZV9tYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19kYXRh YmFzZV9tYW5hZ2VyLmNwcAppbmRleCAyMDE1NTQxLi45MjkzZGUxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfZGF0YWJhc2VfbWFuYWdlci5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2RhdGFiYXNlX21hbmFnZXIu Y3BwCkBAIC03Nyw3ICs3Nyw3IEBAIHN0cnVjdCBFd2tfRGF0YWJhc2VfT3JpZ2luc19Bc3luY19H ZXRfQ29udGV4dCB7CiAKIHN0YXRpYyB2b2lkIGdldERhdGFiYXNlT3JpZ2luc0NhbGxiYWNrKFdL QXJyYXlSZWYgb3JpZ2lucywgV0tFcnJvclJlZiB3a0Vycm9yLCB2b2lkKiBjb250ZXh0KQogewot ICAgIE93blB0cjxFd2tfRGF0YWJhc2VfT3JpZ2luc19Bc3luY19HZXRfQ29udGV4dCo+IHdlYkRh dGFiYXNlQ29udGV4dCA9IGFkb3B0UHRyKHN0YXRpY19jYXN0PEV3a19EYXRhYmFzZV9PcmlnaW5z X0FzeW5jX0dldF9Db250ZXh0Kj4oY29udGV4dCkpOworICAgIE93blB0cjxFd2tfRGF0YWJhc2Vf T3JpZ2luc19Bc3luY19HZXRfQ29udGV4dD4gd2ViRGF0YWJhc2VDb250ZXh0ID0gYWRvcHRQdHIo c3RhdGljX2Nhc3Q8RXdrX0RhdGFiYXNlX09yaWdpbnNfQXN5bmNfR2V0X0NvbnRleHQqPihjb250 ZXh0KSk7CiAgICAgRWluYV9MaXN0KiBvcmlnaW5MaXN0ID0gd2ViRGF0YWJhc2VDb250ZXh0LT5t YW5hZ2VyLT5jcmVhdGVPcmlnaW5MaXN0KG9yaWdpbnMpOwogICAgIE93blB0cjxFd2tFcnJvcj4g ZXdrRXJyb3IgPSBFd2tFcnJvcjo6Y3JlYXRlKHdrRXJyb3IpOwogICAgIHdlYkRhdGFiYXNlQ29u dGV4dC0+Y2FsbGJhY2sob3JpZ2luTGlzdCwgZXdrRXJyb3IuZ2V0KCksIHdlYkRhdGFiYXNlQ29u dGV4dC0+dXNlckRhdGEpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX3N0b3JhZ2VfbWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfc3RvcmFnZV9tYW5hZ2VyLmNwcAppbmRleCBmZDBlYWViLi5jYTkyNWZlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfc3RvcmFnZV9t YW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfc3Rv cmFnZV9tYW5hZ2VyLmNwcApAQCAtNzgsNyArNzgsNyBAQCBzdHJ1Y3QgRXdrX1N0b3JhZ2VfT3Jp Z2luc19Bc3luY19HZXRfQ29udGV4dCB7CiBzdGF0aWMgdm9pZCBnZXRTdG9yYWdlT3JpZ2luc0Nh bGxiYWNrKFdLQXJyYXlSZWYgb3JpZ2lucywgV0tFcnJvclJlZiB3a0Vycm9yLCB2b2lkKiBjb250 ZXh0KQogewogICAgIEVpbmFfTGlzdCogb3JpZ2luTGlzdCA9IDA7Ci0gICAgT3duUHRyPEV3a19T dG9yYWdlX09yaWdpbnNfQXN5bmNfR2V0X0NvbnRleHQqPiB3ZWJTdG9yYWdlQ29udGV4dCA9IGFk b3B0UHRyKHN0YXRpY19jYXN0PEV3a19TdG9yYWdlX09yaWdpbnNfQXN5bmNfR2V0X0NvbnRleHQq Pihjb250ZXh0KSk7CisgICAgT3duUHRyPEV3a19TdG9yYWdlX09yaWdpbnNfQXN5bmNfR2V0X0Nv bnRleHQ+IHdlYlN0b3JhZ2VDb250ZXh0ID0gYWRvcHRQdHIoc3RhdGljX2Nhc3Q8RXdrX1N0b3Jh Z2VfT3JpZ2luc19Bc3luY19HZXRfQ29udGV4dCo+KGNvbnRleHQpKTsKIAogICAgIG9yaWdpbkxp c3QgPSB3ZWJTdG9yYWdlQ29udGV4dC0+bWFuYWdlci0+Y3JlYXRlT3JpZ2luTGlzdChvcmlnaW5z KTsKIAo=