25408 2009-04-26 02:04:08 -0700 [Gtk] gtkdrawing update 2009-04-27 08:10:49 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 jmalonzo jmalonzo oldest_to_newest 118895 0 jmalonzo 2009-04-26 02:04:08 -0700 The following patch updates gtkdrawing.h and gtk2drawing.c to the latest copy from mozilla. gtk2drawing.c revisions: http://hg.mozilla.org/mozilla-central/log/b552b1ef8aa0/widget/src/gtk2/gtk2drawing.c gtkdrawing.h revisions: http://hg.mozilla.org/mozilla-central/log/b552b1ef8aa0/widget/src/gtk2/gtkdrawing.h The only change I did was to change NS_ASSERTION to WTF::ASSERT. 118896 1 29802 jmalonzo 2009-04-26 02:04:40 -0700 Created attachment 29802 moz gtkdrawing update 118912 2 29802 gustavo 2009-04-26 10:20:20 -0700 Comment on attachment 29802 moz gtkdrawing update I trust you have tested this, so I'll say r=me. 118979 3 jmalonzo 2009-04-27 08:10:49 -0700 Landed in r42892 29802 2009-04-26 02:04:40 -0700 2009-04-26 10:20:20 -0700 moz gtkdrawing update moz-gtkdrawing-update.patch text/plain 18388 jmalonzo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ODEzYjBiMC4uY2ZhYTJmMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNCBAQAorMjAwOS0wNC0yNiAgSmFuIE1pY2hhZWwg QWxvbnpvICA8am1hbG9uem9Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXQVJOSU5HOiBOTyBURVNUIENBU0VTIEFEREVEIE9SIENI QU5HRUQKKworICAgICAgICBVcGRhdGUgdG8gdGhlIDI1IEFwciAyMDA5IHZlcnNpb24gb2YgZ3Rr MmRyYXdpbmcuYyBhbmQKKyAgICAgICAgZ3RrZHJhd2luZy5oIGZyb20gTW96aWxsYSAoaHR0cDov L2hnLm1vemlsbGEub3JnL21vemlsbGEtY2VudHJhbCkKKworICAgICAgICAqIHBsYXRmb3JtL2d0 ay9ndGsyZHJhd2luZy5jOgorICAgICAgICAoc2V0dXBfd2lkZ2V0X3Byb3RvdHlwZSk6CisgICAg ICAgIChtb3pfZ3RrX2dldF9jb21ib19ib3hfZW50cnlfYXJyb3cpOgorICAgICAgICAoZW5zdXJl X3Rvb2xiYXJfd2lkZ2V0KToKKyAgICAgICAgKGVuc3VyZV90cmVlX2hlYWRlcl9jZWxsX3dpZGdl dCk6CisgICAgICAgIChtb3pfZ3RrX2luaXQpOgorICAgICAgICAobW96X2d0a19idXR0b25fZ2V0 X2lubmVyX2JvcmRlcik6CisgICAgICAgIChtb3pfZ3RrX3RvZ2dsZV9wYWludCk6CisgICAgICAg IChtb3pfZ3RrX2NhcmV0X3BhaW50KToKKyAgICAgICAgKG1vel9ndGtfZW50cnlfcGFpbnQpOgor ICAgICAgICAobW96X2d0a190cmVlX2hlYWRlcl9jZWxsX3BhaW50KToKKyAgICAgICAgKG1vel9n dGtfY29tYm9fYm94X3BhaW50KToKKyAgICAgICAgKG1vel9ndGtfdG9vbGJhcl9zZXBhcmF0b3Jf cGFpbnQpOgorICAgICAgICAobW96X2d0a19tZW51X3NlcGFyYXRvcl9wYWludCk6CisgICAgICAg IChtb3pfZ3RrX2dldF93aWRnZXRfYm9yZGVyKToKKyAgICAgICAgKG1vel9ndGtfZ2V0X3RhYl9z Y3JvbGxfYXJyb3dfc2l6ZSk6CisgICAgICAgIChtb3pfZ3RrX2dldF90b29sYmFyX3NlcGFyYXRv cl93aWR0aCk6CisgICAgICAgIChtb3pfZ3RrX2dldF9tZW51X3NlcGFyYXRvcl9oZWlnaHQpOgor ICAgICAgICAobW96X2d0a193aWRnZXRfcGFpbnQpOgorICAgICAgICAobW96X2d0a19zaHV0ZG93 bik6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL2d0a2RyYXdpbmcuaDoKKwogMjAwOS0wNC0yNSAg RGlyayBTY2h1bHplICA8a3JpdEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9s aXZlciBIdW50LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvZ3RrMmRyYXdpbmcu YyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL2d0azJkcmF3aW5nLmMKaW5kZXggZGQ0NmU3NC4uYzY4 NmNhZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvZ3RrMmRyYXdpbmcuYworKysg Yi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9ndGsyZHJhd2luZy5jCkBAIC00OSw2ICs0OSw4IEBACiAj aW5jbHVkZSA8c3RyaW5nLmg+CiAjaW5jbHVkZSAiZ3RrZHJhd2luZy5oIgogCisjaW5jbHVkZSAi QXNzZXJ0aW9ucy5oIgorCiAjaW5jbHVkZSA8bWF0aC5oPgogCiAjZGVmaW5lIFhUSElDS05FU1Mo c3R5bGUpIChzdHlsZS0+eHRoaWNrbmVzcykKQEAgLTU2LDYgKzU4LDcgQEAKICNkZWZpbmUgV0lO RE9XX0lTX01BUFBFRCh3aW5kb3cpICgod2luZG93KSAmJiBHREtfSVNfV0lORE9XKHdpbmRvdykg JiYgZ2RrX3dpbmRvd19pc192aXNpYmxlKHdpbmRvdykpCiAKIHN0YXRpYyBHdGtXaWRnZXQqIGdQ cm90b1dpbmRvdzsKK3N0YXRpYyBHdGtXaWRnZXQqIGdQcm90b0xheW91dDsKIHN0YXRpYyBHdGtX aWRnZXQqIGdCdXR0b25XaWRnZXQ7CiBzdGF0aWMgR3RrV2lkZ2V0KiBnVG9nZ2xlQnV0dG9uV2lk Z2V0Owogc3RhdGljIEd0a1dpZGdldCogZ0J1dHRvbkFycm93V2lkZ2V0OwpAQCAtMTAxLDcgKzEw NCw2IEBAIHN0YXRpYyBHdGtXaWRnZXQqIGdTY3JvbGxlZFdpbmRvd1dpZGdldDsKIAogc3RhdGlj IHN0eWxlX3Byb3BfdCBzdHlsZV9wcm9wX2Z1bmM7CiBzdGF0aWMgZ2Jvb2xlYW4gaGF2ZV9hcnJv d19zY2FsaW5nOwotc3RhdGljIGdib29sZWFuIGhhdmVfMl8xMDsKIHN0YXRpYyBnYm9vbGVhbiBp c19pbml0aWFsaXplZDsKIAogLyogQmVjYXVzZSB3ZSBoYXZlIHN1Y2ggYW4gdW5jb252ZW50aW9u YWwgd2F5IG9mIGRyYXdpbmcgd2lkZ2V0cywgc2lnbmFsIHRvIHRoZSBHVEsgdGhlbWUgZW5naW5l CkBAIC0xMzQsMTQgKzEzNiwxMyBAQCBlbnN1cmVfd2luZG93X3dpZGdldCgpCiBzdGF0aWMgZ2lu dAogc2V0dXBfd2lkZ2V0X3Byb3RvdHlwZShHdGtXaWRnZXQqIHdpZGdldCkKIHsKLSAgICBzdGF0 aWMgR3RrV2lkZ2V0KiBwcm90b0xheW91dDsKICAgICBlbnN1cmVfd2luZG93X3dpZGdldCgpOwot ICAgIGlmICghcHJvdG9MYXlvdXQpIHsKLSAgICAgICAgcHJvdG9MYXlvdXQgPSBndGtfZml4ZWRf bmV3KCk7Ci0gICAgICAgIGd0a19jb250YWluZXJfYWRkKEdUS19DT05UQUlORVIoZ1Byb3RvV2lu ZG93KSwgcHJvdG9MYXlvdXQpOworICAgIGlmICghZ1Byb3RvTGF5b3V0KSB7CisgICAgICAgIGdQ cm90b0xheW91dCA9IGd0a19maXhlZF9uZXcoKTsKKyAgICAgICAgZ3RrX2NvbnRhaW5lcl9hZGQo R1RLX0NPTlRBSU5FUihnUHJvdG9XaW5kb3cpLCBnUHJvdG9MYXlvdXQpOwogICAgIH0KIAotICAg IGd0a19jb250YWluZXJfYWRkKEdUS19DT05UQUlORVIocHJvdG9MYXlvdXQpLCB3aWRnZXQpOwor ICAgIGd0a19jb250YWluZXJfYWRkKEdUS19DT05UQUlORVIoZ1Byb3RvTGF5b3V0KSwgd2lkZ2V0 KTsKICAgICBndGtfd2lkZ2V0X3JlYWxpemUod2lkZ2V0KTsKICAgICBnX29iamVjdF9zZXRfZGF0 YShHX09CSkVDVCh3aWRnZXQpLCAidHJhbnNwYXJlbnQtYmctaGludCIsIEdJTlRfVE9fUE9JTlRF UihUUlVFKSk7CiAgICAgcmV0dXJuIE1PWl9HVEtfU1VDQ0VTUzsKQEAgLTQwOSw4ICs0MTAsNyBA QCBtb3pfZ3RrX2dldF9jb21ib19ib3hfZW50cnlfYXJyb3coR3RrV2lkZ2V0ICp3aWRnZXQsIGdw b2ludGVyIGNsaWVudF9kYXRhKQogICAgICAgICBnX29iamVjdF9hZGRfd2Vha19wb2ludGVyKEdf T0JKRUNUKHdpZGdldCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGdwb2lu dGVyKSAmZ0NvbWJvQm94RW50cnlBcnJvd1dpZGdldCk7CiAgICAgICAgIGd0a193aWRnZXRfcmVh bGl6ZSh3aWRnZXQpOwotICAgICAgICBnX29iamVjdF9zZXRfZGF0YShHX09CSkVDVCh3aWRnZXQp LCAidHJhbnNwYXJlbnQtYmctaGludCIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgIEdJTlRf VE9fUE9JTlRFUihUUlVFKSk7CisgICAgICAgIGdfb2JqZWN0X3NldF9kYXRhKEdfT0JKRUNUKHdp ZGdldCksICJ0cmFuc3BhcmVudC1iZy1oaW50IiwgR0lOVF9UT19QT0lOVEVSKFRSVUUpKTsKICAg ICB9CiB9CiAKQEAgLTUwMiw4ICs1MDIsNyBAQCBlbnN1cmVfdG9vbGJhcl93aWRnZXQoKQogICAg ICAgICBnVG9vbGJhcldpZGdldCA9IGd0a190b29sYmFyX25ldygpOwogICAgICAgICBndGtfY29u dGFpbmVyX2FkZChHVEtfQ09OVEFJTkVSKGdIYW5kbGVCb3hXaWRnZXQpLCBnVG9vbGJhcldpZGdl dCk7CiAgICAgICAgIGd0a193aWRnZXRfcmVhbGl6ZShnVG9vbGJhcldpZGdldCk7Ci0gICAgICAg IGdfb2JqZWN0X3NldF9kYXRhKEdfT0JKRUNUKGdUb29sYmFyV2lkZ2V0KSwgInRyYW5zcGFyZW50 LWJnLWhpbnQiLAotICAgICAgICAgICAgICAgICAgICAgICAgICBHSU5UX1RPX1BPSU5URVIoVFJV RSkpOworICAgICAgICBnX29iamVjdF9zZXRfZGF0YShHX09CSkVDVChnVG9vbGJhcldpZGdldCks ICJ0cmFuc3BhcmVudC1iZy1oaW50IiwgR0lOVF9UT19QT0lOVEVSKFRSVUUpKTsKICAgICB9CiAg ICAgcmV0dXJuIE1PWl9HVEtfU1VDQ0VTUzsKIH0KQEAgLTcxMCwxNyArNzA5LDE3IEBAIGVuc3Vy ZV90cmVlX2hlYWRlcl9jZWxsX3dpZGdldCgpCiAgICAgICAgIGd0a190cmVlX3ZpZXdfYXBwZW5k X2NvbHVtbihHVEtfVFJFRV9WSUVXKGdUcmVlVmlld1dpZGdldCksIGZpcnN0VHJlZVZpZXdDb2x1 bW4pOwogCiAgICAgICAgIGdNaWRkbGVUcmVlVmlld0NvbHVtbiA9IGd0a190cmVlX3ZpZXdfY29s dW1uX25ldygpOwotICAgICAgICBndGtfdHJlZV92aWV3X2NvbHVtbl9zZXRfdGl0bGUoR1RLX1RS RUVfVklFV19DT0xVTU4oZ01pZGRsZVRyZWVWaWV3Q29sdW1uKSwgIk0iKTsKKyAgICAgICAgZ3Rr X3RyZWVfdmlld19jb2x1bW5fc2V0X3RpdGxlKGdNaWRkbGVUcmVlVmlld0NvbHVtbiwgIk0iKTsK ICAgICAgICAgZ3RrX3RyZWVfdmlld19hcHBlbmRfY29sdW1uKEdUS19UUkVFX1ZJRVcoZ1RyZWVW aWV3V2lkZ2V0KSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdUS19UUkVF X1ZJRVdfQ09MVU1OKGdNaWRkbGVUcmVlVmlld0NvbHVtbikpOworICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZ01pZGRsZVRyZWVWaWV3Q29sdW1uKTsKIAogICAgICAgICBsYXN0 VHJlZVZpZXdDb2x1bW4gPSBndGtfdHJlZV92aWV3X2NvbHVtbl9uZXcoKTsKICAgICAgICAgZ3Rr X3RyZWVfdmlld19jb2x1bW5fc2V0X3RpdGxlKGxhc3RUcmVlVmlld0NvbHVtbiwgIk0iKTsKICAg ICAgICAgZ3RrX3RyZWVfdmlld19hcHBlbmRfY29sdW1uKEdUS19UUkVFX1ZJRVcoZ1RyZWVWaWV3 V2lkZ2V0KSwgbGFzdFRyZWVWaWV3Q29sdW1uKTsKIAogICAgICAgICAvKiBVc2UgdGhlIG1pZGRs ZSBjb2x1bW4ncyBoZWFkZXIgZm9yIG91ciBidXR0b24gKi8KLSAgICAgICAgZ1RyZWVIZWFkZXJD ZWxsV2lkZ2V0ID0gR1RLX1RSRUVfVklFV19DT0xVTU4oZ01pZGRsZVRyZWVWaWV3Q29sdW1uKS0+ YnV0dG9uOwotICAgICAgICBnVHJlZUhlYWRlclNvcnRBcnJvd1dpZGdldCA9IEdUS19UUkVFX1ZJ RVdfQ09MVU1OKGdNaWRkbGVUcmVlVmlld0NvbHVtbiktPmFycm93OworICAgICAgICBnVHJlZUhl YWRlckNlbGxXaWRnZXQgPSBnTWlkZGxlVHJlZVZpZXdDb2x1bW4tPmJ1dHRvbjsKKyAgICAgICAg Z1RyZWVIZWFkZXJTb3J0QXJyb3dXaWRnZXQgPSBnTWlkZGxlVHJlZVZpZXdDb2x1bW4tPmFycm93 OwogICAgICAgICBnX29iamVjdF9zZXRfZGF0YShHX09CSkVDVChnVHJlZUhlYWRlckNlbGxXaWRn ZXQpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAidHJhbnNwYXJlbnQtYmctaGludCIsIEdJ TlRfVE9fUE9JTlRFUihUUlVFKSk7CiAgICAgICAgIGdfb2JqZWN0X3NldF9kYXRhKEdfT0JKRUNU KGdUcmVlSGVhZGVyU29ydEFycm93V2lkZ2V0KSwKQEAgLTg4MCw5ICs4NzksNiBAQCBtb3pfZ3Rr X2luaXQoKQogICAgIGhhdmVfYXJyb3dfc2NhbGluZyA9IChndGtfbWFqb3JfdmVyc2lvbiA+IDIg fHwKICAgICAgICAgICAgICAgICAgICAgICAgICAgKGd0a19tYWpvcl92ZXJzaW9uID09IDIgJiYg Z3RrX21pbm9yX3ZlcnNpb24gPj0gMTIpKTsKIAotICAgIGhhdmVfMl8xMCA9IChndGtfbWFqb3Jf dmVyc2lvbiA+IDIgfHwKLSAgICAgICAgICAgICAgICAgKGd0a19tYWpvcl92ZXJzaW9uID09IDIg JiYgZ3RrX21pbm9yX3ZlcnNpb24gPj0gMTApKTsKLQogICAgIC8qIEFkZCBzdHlsZSBwcm9wZXJ0 eSB0byBHdGtFbnRyeS4KICAgICAgKiBBZGRpbmcgdGhlIHN0eWxlIHByb3BlcnR5IHRvIHRoZSBu b3JtYWwgR3RrRW50cnkgY2xhc3MgbWVhbnMgdGhhdCBpdAogICAgICAqIHdpbGwgd29yayB3aXRo b3V0IGlzc3VlcyBpbnNpZGUgR3RrQ29tYm9Cb3ggYW5kIGZvciBTcGluYnV0dG9ucy4gKi8KQEAg LTk1MywxMCArOTQ5LDkgQEAgZ2ludAogbW96X2d0a19idXR0b25fZ2V0X2lubmVyX2JvcmRlcihH dGtXaWRnZXQqIHdpZGdldCwgR3RrQm9yZGVyKiBpbm5lcl9ib3JkZXIpCiB7CiAgICAgc3RhdGlj IGNvbnN0IEd0a0JvcmRlciBkZWZhdWx0X2lubmVyX2JvcmRlciA9IHsgMSwgMSwgMSwgMSB9Owot ICAgIEd0a0JvcmRlciAqdG1wX2JvcmRlciA9IE5VTEw7CisgICAgR3RrQm9yZGVyICp0bXBfYm9y ZGVyOwogCi0gICAgaWYgKGhhdmVfMl8xMCkKLSAgICAgICAgZ3RrX3dpZGdldF9zdHlsZV9nZXQg KHdpZGdldCwgImlubmVyLWJvcmRlciIsICZ0bXBfYm9yZGVyLCBOVUxMKTsKKyAgICBndGtfd2lk Z2V0X3N0eWxlX2dldCAod2lkZ2V0LCAiaW5uZXItYm9yZGVyIiwgJnRtcF9ib3JkZXIsIE5VTEwp OwogCiAgICAgaWYgKHRtcF9ib3JkZXIpIHsKICAgICAgICAgKmlubmVyX2JvcmRlciA9ICp0bXBf Ym9yZGVyOwpAQCAtOTcxLDggKzk2Niw4IEBAIG1vel9ndGtfYnV0dG9uX2dldF9pbm5lcl9ib3Jk ZXIoR3RrV2lkZ2V0KiB3aWRnZXQsIEd0a0JvcmRlciogaW5uZXJfYm9yZGVyKQogc3RhdGljIGdp bnQKIG1vel9ndGtfdG9nZ2xlX3BhaW50KEdka0RyYXdhYmxlKiBkcmF3YWJsZSwgR2RrUmVjdGFu Z2xlKiByZWN0LAogICAgICAgICAgICAgICAgICAgICAgR2RrUmVjdGFuZ2xlKiBjbGlwcmVjdCwg R3RrV2lkZ2V0U3RhdGUqIHN0YXRlLAotICAgICAgICAgICAgICAgICAgICAgZ2Jvb2xlYW4gc2Vs ZWN0ZWQsIGdib29sZWFuIGlzcmFkaW8sCi0gICAgICAgICAgICAgICAgICAgICBHdGtUZXh0RGly ZWN0aW9uIGRpcmVjdGlvbikKKyAgICAgICAgICAgICAgICAgICAgIGdib29sZWFuIHNlbGVjdGVk LCBnYm9vbGVhbiBpbmNvbnNpc3RlbnQsCisgICAgICAgICAgICAgICAgICAgICBnYm9vbGVhbiBp c3JhZGlvLCBHdGtUZXh0RGlyZWN0aW9uIGRpcmVjdGlvbikKIHsKICAgICBHdGtTdGF0ZVR5cGUg c3RhdGVfdHlwZSA9IENvbnZlcnRHdGtTdGF0ZShzdGF0ZSk7CiAgICAgR3RrU2hhZG93VHlwZSBz aGFkb3dfdHlwZSA9IChzZWxlY3RlZCk/R1RLX1NIQURPV19JTjpHVEtfU0hBRE9XX09VVDsKQEAg LTk5MCw2ICs5ODUsOSBAQCBtb3pfZ3RrX3RvZ2dsZV9wYWludChHZGtEcmF3YWJsZSogZHJhd2Fi bGUsIEdka1JlY3RhbmdsZSogcmVjdCwKICAgICAgICAgdyA9IGdDaGVja2JveFdpZGdldDsKICAg ICB9CiAKKyAgICAvLyAiR2V0TWluaW11bVdpZGdldFNpemUgd2FzIGlnbm9yZWQiCisgICAgQVNT RVJUKHJlY3QtPndpZHRoID09IGluZGljYXRvcl9zaXplKTsKKwogICAgIC8qCiAgICAgICogdmVy dGljYWxseSBjZW50ZXIgaW4gdGhlIGJveCwgc2luY2UgWFVMIHNvbWV0aW1lcyBpZ25vcmVzIG91 cgogICAgICAqIEdldE1pbmltdW1XaWRnZXRTaXplIGluIHRoZSB2ZXJ0aWNhbCBkaW1lbnNpb24K QEAgLTEwMjIsNiArMTAyMCwxNyBAQCBtb3pfZ3RrX3RvZ2dsZV9wYWludChHZGtEcmF3YWJsZSog ZHJhd2FibGUsIEdka1JlY3RhbmdsZSogcmVjdCwKICAgICAgICAgfQogICAgIH0KICAgICBlbHNl IHsKKyAgICAgICAvKgorICAgICAgICAqICdpbmRldGVybWluYXRlJyB0eXBlIG9uIGNoZWNrYm94 ZXMuIEluIEdUSywgdGhlIHNoYWRvdyB0eXBlCisgICAgICAgICogbXVzdCBhbHNvIGJlIGNoYW5n ZWQgZm9yIHRoZSBzdGF0ZSB0byBiZSBkcmF3bi4KKyAgICAgICAgKi8KKyAgICAgICAgaWYgKGlu Y29uc2lzdGVudCkgeworICAgICAgICAgICAgZ3RrX3RvZ2dsZV9idXR0b25fc2V0X2luY29uc2lz dGVudChHVEtfVE9HR0xFX0JVVFRPTihnQ2hlY2tib3hXaWRnZXQpLCBUUlVFKTsKKyAgICAgICAg ICAgIHNoYWRvd190eXBlID0gR1RLX1NIQURPV19FVENIRURfSU47CisgICAgICAgIH0gZWxzZSB7 CisgICAgICAgICAgICBndGtfdG9nZ2xlX2J1dHRvbl9zZXRfaW5jb25zaXN0ZW50KEdUS19UT0dH TEVfQlVUVE9OKGdDaGVja2JveFdpZGdldCksIEZBTFNFKTsKKyAgICAgICAgfQorCiAgICAgICAg IGd0a19wYWludF9jaGVjayhzdHlsZSwgZHJhd2FibGUsIHN0YXRlX3R5cGUsIHNoYWRvd190eXBl LCBjbGlwcmVjdCwgCiAgICAgICAgICAgICAgICAgICAgICAgICBnQ2hlY2tib3hXaWRnZXQsICJj aGVja2J1dHRvbiIsIHgsIHksIHdpZHRoLCBoZWlnaHQpOwogICAgICAgICBpZiAoc3RhdGUtPmZv Y3VzZWQpIHsKQEAgLTE0OTAsOSArMTQ5OSwxNSBAQCBzdGF0aWMgZ2ludAogbW96X2d0a19jYXJl dF9wYWludChHZGtEcmF3YWJsZSogZHJhd2FibGUsIEdka1JlY3RhbmdsZSogcmVjdCwKICAgICAg ICAgICAgICAgICAgICAgR2RrUmVjdGFuZ2xlKiBjbGlwcmVjdCwgR3RrVGV4dERpcmVjdGlvbiBk aXJlY3Rpb24pCiB7CisgICAgR2RrUmVjdGFuZ2xlIGxvY2F0aW9uID0gKnJlY3Q7CisgICAgaWYg KGRpcmVjdGlvbiA9PSBHVEtfVEVYVF9ESVJfUlRMKSB7CisgICAgICAgIC8qIGd0a19kcmF3X2lu c2VydGlvbl9jdXJzb3IgaWdub3JlcyBsb2NhdGlvbi53aWR0aCAqLworICAgICAgICBsb2NhdGlv bi54ID0gcmVjdC0+eCArIHJlY3QtPndpZHRoOworICAgIH0KKwogICAgIGVuc3VyZV9lbnRyeV93 aWRnZXQoKTsKICAgICBndGtfZHJhd19pbnNlcnRpb25fY3Vyc29yKGdFbnRyeVdpZGdldCwgZHJh d2FibGUsIGNsaXByZWN0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVjdCwgVFJV RSwgZGlyZWN0aW9uLCBGQUxTRSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmbG9j YXRpb24sIFRSVUUsIGRpcmVjdGlvbiwgRkFMU0UpOwogCiAgICAgcmV0dXJuIE1PWl9HVEtfU1VD Q0VTUzsKIH0KQEAgLTE1MzgsOCArMTU1Myw3IEBAIG1vel9ndGtfZW50cnlfcGFpbnQoR2RrRHJh d2FibGUqIGRyYXdhYmxlLCBHZGtSZWN0YW5nbGUqIHJlY3QsCiAgICAgICogSWYgdGhlIHRoZW1l IGlzIGFibGUgdG8gY29wZSB3aXRoIHRyYW5zcGFyZW5jeSwgdGhlbiB3ZSBjYW4gc2tpcCBwcmUt ZmlsbGluZwogICAgICAqIGFuZCBub3RpZnkgdGhlIHRoZW1lIGl0IHdpbGwgcGFpbnQgZGlyZWN0 bHkgb24gdGhlIGNhbnZhcy4gKi8KICAgICBpZiAodGhlbWVfaG9ub3JzX3RyYW5zcGFyZW5jeSkg ewotICAgICAgICBnX29iamVjdF9zZXRfZGF0YShHX09CSkVDVCh3aWRnZXQpLCAidHJhbnNwYXJl bnQtYmctaGludCIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgIEdJTlRfVE9fUE9JTlRFUihU UlVFKSk7CisgICAgICAgIGdfb2JqZWN0X3NldF9kYXRhKEdfT0JKRUNUKHdpZGdldCksICJ0cmFu c3BhcmVudC1iZy1oaW50IiwgR0lOVF9UT19QT0lOVEVSKFRSVUUpKTsKICAgICB9IGVsc2Ugewog ICAgICAgICBnZGtfZHJhd19yZWN0YW5nbGUoZHJhd2FibGUsIHN0eWxlLT5iYXNlX2djW2JnX3N0 YXRlXSwgVFJVRSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNsaXByZWN0LT54LCBjbGlw cmVjdC0+eSwgY2xpcHJlY3QtPndpZHRoLCBjbGlwcmVjdC0+aGVpZ2h0KTsKQEAgLTE2NTAsNyAr MTY2NCw3IEBAIG1vel9ndGtfdHJlZV9oZWFkZXJfY2VsbF9wYWludChHZGtEcmF3YWJsZSogZHJh d2FibGUsIEdka1JlY3RhbmdsZSogcmVjdCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBHZGtSZWN0YW5nbGUqIGNsaXByZWN0LCBHdGtXaWRnZXRTdGF0ZSogc3RhdGUsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZ2Jvb2xlYW4gaXNTb3J0ZWQsIEd0a1RleHREaXJlY3Rp b24gZGlyZWN0aW9uKQogewotICAgIGd0a190cmVlX3ZpZXdfY29sdW1uX3NldF9zb3J0X2luZGlj YXRvcihHVEtfVFJFRV9WSUVXX0NPTFVNTihnTWlkZGxlVHJlZVZpZXdDb2x1bW4pLAorICAgIGd0 a190cmVlX3ZpZXdfY29sdW1uX3NldF9zb3J0X2luZGljYXRvcihnTWlkZGxlVHJlZVZpZXdDb2x1 bW4sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlzU29ydGVk KTsKIAogICAgIG1vel9ndGtfYnV0dG9uX3BhaW50KGRyYXdhYmxlLCByZWN0LCBjbGlwcmVjdCwg c3RhdGUsIEdUS19SRUxJRUZfTk9STUFMLApAQCAtMTc0Miw4ICsxNzU2LDggQEAgbW96X2d0a19j b21ib19ib3hfcGFpbnQoR2RrRHJhd2FibGUqIGRyYXdhYmxlLCBHZGtSZWN0YW5nbGUqIHJlY3Qs CiAgICAgICAgICAgICAgICAgICAgICAgICBnYm9vbGVhbiBpc2h0bWwsIEd0a1RleHREaXJlY3Rp b24gZGlyZWN0aW9uKQogewogICAgIEdka1JlY3RhbmdsZSBhcnJvd19yZWN0LCByZWFsX2Fycm93 X3JlY3Q7Ci0gICAgZ2ludCBhcnJvd19zaXplLCBzZXBhcmF0b3Jfd2lkdGggPSAwOwotICAgIGdi b29sZWFuIHdpZGVfc2VwYXJhdG9ycyA9IEZBTFNFOworICAgIGdpbnQgYXJyb3dfc2l6ZSwgc2Vw YXJhdG9yX3dpZHRoOworICAgIGdib29sZWFuIHdpZGVfc2VwYXJhdG9yczsKICAgICBHdGtTdGF0 ZVR5cGUgc3RhdGVfdHlwZSA9IENvbnZlcnRHdGtTdGF0ZShzdGF0ZSk7CiAgICAgR3RrU2hhZG93 VHlwZSBzaGFkb3dfdHlwZSA9IHN0YXRlLT5hY3RpdmUgPyBHVEtfU0hBRE9XX0lOIDogR1RLX1NI QURPV19PVVQ7CiAgICAgR3RrU3R5bGUqIHN0eWxlOwpAQCAtMTc4NiwxMSArMTgwMCwxMCBAQCBt b3pfZ3RrX2NvbWJvX2JveF9wYWludChHZGtEcmF3YWJsZSogZHJhd2FibGUsIEdka1JlY3Rhbmds ZSogcmVjdCwKICAgICBzdHlsZSA9IGdDb21ib0JveFNlcGFyYXRvcldpZGdldC0+c3R5bGU7CiAg ICAgVFNPZmZzZXRTdHlsZUdDcyhzdHlsZSwgcmVjdC0+eCwgcmVjdC0+eSk7CiAKLSAgICBpZiAo aGF2ZV8yXzEwKQotICAgICAgICBndGtfd2lkZ2V0X3N0eWxlX2dldChnQ29tYm9Cb3hTZXBhcmF0 b3JXaWRnZXQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ3aWRlLXNlcGFyYXRvcnMi LCAmd2lkZV9zZXBhcmF0b3JzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAic2VwYXJh dG9yLXdpZHRoIiwgJnNlcGFyYXRvcl93aWR0aCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgTlVMTCk7CisgICAgZ3RrX3dpZGdldF9zdHlsZV9nZXQoZ0NvbWJvQm94U2VwYXJhdG9yV2lk Z2V0LAorICAgICAgICAgICAgICAgICAgICAgICAgICJ3aWRlLXNlcGFyYXRvcnMiLCAmd2lkZV9z ZXBhcmF0b3JzLAorICAgICAgICAgICAgICAgICAgICAgICAgICJzZXBhcmF0b3Itd2lkdGgiLCAm c2VwYXJhdG9yX3dpZHRoLAorICAgICAgICAgICAgICAgICAgICAgICAgIE5VTEwpOwogCiAgICAg aWYgKHdpZGVfc2VwYXJhdG9ycykgewogICAgICAgICBpZiAoZGlyZWN0aW9uID09IEdUS19URVhU X0RJUl9MVFIpCkBAIC0yMDE1LDkgKzIwMjgsOSBAQCBtb3pfZ3RrX3Rvb2xiYXJfc2VwYXJhdG9y X3BhaW50KEdka0RyYXdhYmxlKiBkcmF3YWJsZSwgR2RrUmVjdGFuZ2xlKiByZWN0LAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBHdGtUZXh0RGlyZWN0aW9uIGRpcmVjdGlvbikKIHsK ICAgICBHdGtTdHlsZSogc3R5bGU7Ci0gICAgZ2ludCAgICAgc2VwYXJhdG9yX3dpZHRoID0gMDsK KyAgICBnaW50ICAgICBzZXBhcmF0b3Jfd2lkdGg7CiAgICAgZ2ludCAgICAgcGFpbnRfd2lkdGg7 Ci0gICAgZ2Jvb2xlYW4gd2lkZV9zZXBhcmF0b3JzID0gRkFMU0U7CisgICAgZ2Jvb2xlYW4gd2lk ZV9zZXBhcmF0b3JzOwogICAgIAogICAgIC8qIERlZmluZWQgYXMgY29uc3RhbnRzIGluIEdUSysg Mi4xMC4xNCAqLwogICAgIGNvbnN0IGRvdWJsZSBzdGFydF9mcmFjdGlvbiA9IDAuMjsKQEAgLTIw MjgsMTEgKzIwNDEsMTAgQEAgbW96X2d0a190b29sYmFyX3NlcGFyYXRvcl9wYWludChHZGtEcmF3 YWJsZSogZHJhd2FibGUsIEdka1JlY3RhbmdsZSogcmVjdCwKIAogICAgIHN0eWxlID0gZ1Rvb2xi YXJTZXBhcmF0b3JXaWRnZXQtPnN0eWxlOwogCi0gICAgaWYgKGhhdmVfMl8xMCkKLSAgICAgICAg Z3RrX3dpZGdldF9zdHlsZV9nZXQoZ1Rvb2xiYXJXaWRnZXQsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICJ3aWRlLXNlcGFyYXRvcnMiLCAmd2lkZV9zZXBhcmF0b3JzLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAic2VwYXJhdG9yLXdpZHRoIiwgJnNlcGFyYXRvcl93aWR0aCwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCk7CisgICAgZ3RrX3dpZGdldF9zdHls ZV9nZXQoZ1Rvb2xiYXJXaWRnZXQsCisgICAgICAgICAgICAgICAgICAgICAgICAgIndpZGUtc2Vw YXJhdG9ycyIsICZ3aWRlX3NlcGFyYXRvcnMsCisgICAgICAgICAgICAgICAgICAgICAgICAgInNl cGFyYXRvci13aWR0aCIsICZzZXBhcmF0b3Jfd2lkdGgsCisgICAgICAgICAgICAgICAgICAgICAg ICAgTlVMTCk7CiAKICAgICBUU09mZnNldFN0eWxlR0NzKHN0eWxlLCByZWN0LT54LCByZWN0LT55 KTsKIApAQCAtMjQyMyw5ICsyNDM1LDkgQEAgbW96X2d0a19tZW51X3NlcGFyYXRvcl9wYWludChH ZGtEcmF3YWJsZSogZHJhd2FibGUsIEdka1JlY3RhbmdsZSogcmVjdCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgR2RrUmVjdGFuZ2xlKiBjbGlwcmVjdCwgR3RrVGV4dERpcmVjdGlvbiBk aXJlY3Rpb24pCiB7CiAgICAgR3RrU3R5bGUqIHN0eWxlOwotICAgIGdib29sZWFuIHdpZGVfc2Vw YXJhdG9ycyA9IEZBTFNFOwotICAgIGdpbnQgc2VwYXJhdG9yX2hlaWdodCA9IDA7Ci0gICAgZ3Vp bnQgaG9yaXpvbnRhbF9wYWRkaW5nID0gMDsKKyAgICBnYm9vbGVhbiB3aWRlX3NlcGFyYXRvcnM7 CisgICAgZ2ludCBzZXBhcmF0b3JfaGVpZ2h0OworICAgIGd1aW50IGhvcml6b250YWxfcGFkZGlu ZzsKICAgICBnaW50IHBhaW50X2hlaWdodDsKIAogICAgIGVuc3VyZV9tZW51X3NlcGFyYXRvcl93 aWRnZXQoKTsKQEAgLTI0MzMsMTMgKzI0NDUsOSBAQCBtb3pfZ3RrX21lbnVfc2VwYXJhdG9yX3Bh aW50KEdka0RyYXdhYmxlKiBkcmF3YWJsZSwgR2RrUmVjdGFuZ2xlKiByZWN0LAogCiAgICAgc3R5 bGUgPSBnTWVudVNlcGFyYXRvcldpZGdldC0+c3R5bGU7CiAKLSAgICBpZiAoaGF2ZV8yXzEwKQot ICAgICAgICBndGtfd2lkZ2V0X3N0eWxlX2dldChnTWVudVNlcGFyYXRvcldpZGdldCwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIndpZGUtc2VwYXJhdG9ycyIsICAgICZ3aWRlX3NlcGFy YXRvcnMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICJzZXBhcmF0b3ItaGVpZ2h0Iiwg ICAmc2VwYXJhdG9yX2hlaWdodCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCk7 Ci0KICAgICBndGtfd2lkZ2V0X3N0eWxlX2dldChnTWVudVNlcGFyYXRvcldpZGdldCwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAid2lkZS1zZXBhcmF0b3JzIiwgICAgJndpZGVfc2VwYXJhdG9y cywKKyAgICAgICAgICAgICAgICAgICAgICAgICAic2VwYXJhdG9yLWhlaWdodCIsICAgJnNlcGFy YXRvcl9oZWlnaHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgImhvcml6b250YWwtcGFkZGlu ZyIsICZob3Jpem9udGFsX3BhZGRpbmcsCiAgICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCk7 CiAKQEAgLTI2ODcsNyArMjY5NSw3IEBAIG1vel9ndGtfZ2V0X3dpZGdldF9ib3JkZXIoR3RrVGhl bWVXaWRnZXRUeXBlIHdpZGdldCwgZ2ludCogbGVmdCwgZ2ludCogdG9wLAogICAgICAgICAgICAg LyogV2UgbmVlZCB0byBhY2NvdW50IGZvciB0aGUgYXJyb3cgb24gdGhlIGRyb3Bkb3duLCBzbyB0 ZXh0CiAgICAgICAgICAgICAgKiBkb2Vzbid0IGNvbWUgdG9vIGNsb3NlIHRvIHRoZSBhcnJvdywg b3IgaW4gc29tZSBjYXNlcyBzcGlsbAogICAgICAgICAgICAgICogaW50byB0aGUgYXJyb3cuICov Ci0gICAgICAgICAgICBnYm9vbGVhbiBpZ25vcmVkX2ludGVyaW9yX2ZvY3VzLCB3aWRlX3NlcGFy YXRvcnMgPSBGQUxTRTsKKyAgICAgICAgICAgIGdib29sZWFuIGlnbm9yZWRfaW50ZXJpb3JfZm9j dXMsIHdpZGVfc2VwYXJhdG9yczsKICAgICAgICAgICAgIGdpbnQgZm9jdXNfd2lkdGgsIGZvY3Vz X3BhZCwgc2VwYXJhdG9yX3dpZHRoOwogICAgICAgICAgICAgR3RrUmVxdWlzaXRpb24gYXJyb3df cmVxOwogCkBAIC0yNzEwLDExICsyNzE4LDEwIEBAIG1vel9ndGtfZ2V0X3dpZGdldF9ib3JkZXIo R3RrVGhlbWVXaWRnZXRUeXBlIHdpZGdldCwgZ2ludCogbGVmdCwgZ2ludCogdG9wLAogICAgICAg ICAgICAgLyogSWYgdGhlcmUgaXMgbm8gc2VwYXJhdG9yLCBkb24ndCB0cnkgdG8gY291bnQgaXRz IHdpZHRoLiAqLwogICAgICAgICAgICAgc2VwYXJhdG9yX3dpZHRoID0gMDsKICAgICAgICAgICAg IGlmIChnQ29tYm9Cb3hTZXBhcmF0b3JXaWRnZXQpIHsKLSAgICAgICAgICAgICAgICBpZiAoaGF2 ZV8yXzEwKQotICAgICAgICAgICAgICAgICAgICBndGtfd2lkZ2V0X3N0eWxlX2dldChnQ29tYm9C b3hTZXBhcmF0b3JXaWRnZXQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICJ3aWRlLXNlcGFyYXRvcnMiLCAmd2lkZV9zZXBhcmF0b3JzLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAic2VwYXJhdG9yLXdpZHRoIiwgJnNlcGFyYXRvcl93 aWR0aCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCk7Cisg ICAgICAgICAgICAgICAgZ3RrX3dpZGdldF9zdHlsZV9nZXQoZ0NvbWJvQm94U2VwYXJhdG9yV2lk Z2V0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ3aWRlLXNlcGFyYXRv cnMiLCAmd2lkZV9zZXBhcmF0b3JzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICJzZXBhcmF0b3Itd2lkdGgiLCAmc2VwYXJhdG9yX3dpZHRoLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIE5VTEwpOwogCiAgICAgICAgICAgICAgICAgaWYgKCF3aWRl X3NlcGFyYXRvcnMpCiAgICAgICAgICAgICAgICAgICAgIHNlcGFyYXRvcl93aWR0aCA9CkBAIC0y ODk1LDEzICsyOTAyLDEyIEBAIG1vel9ndGtfZ2V0X2NvbWJvX2JveF9lbnRyeV9idXR0b25fc2l6 ZShnaW50KiB3aWR0aCwgZ2ludCogaGVpZ2h0KQogZ2ludAogbW96X2d0a19nZXRfdGFiX3Njcm9s bF9hcnJvd19zaXplKGdpbnQqIHdpZHRoLCBnaW50KiBoZWlnaHQpCiB7Ci0gICAgZ2ludCBhcnJv d19zaXplID0gMTY7CisgICAgZ2ludCBhcnJvd19zaXplOwogCiAgICAgZW5zdXJlX3RhYl93aWRn ZXQoKTsKLSAgICBpZiAoaGF2ZV8yXzEwKQotICAgICAgICBndGtfd2lkZ2V0X3N0eWxlX2dldChn VGFiV2lkZ2V0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAic2Nyb2xsLWFycm93LWhs ZW5ndGgiLCAmYXJyb3dfc2l6ZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCk7 CisgICAgZ3RrX3dpZGdldF9zdHlsZV9nZXQoZ1RhYldpZGdldCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAic2Nyb2xsLWFycm93LWhsZW5ndGgiLCAmYXJyb3dfc2l6ZSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICBOVUxMKTsKIAogICAgICpoZWlnaHQgPSAqd2lkdGggPSBhcnJvd19zaXpl OwogCkBAIC0yOTI0LDIyICsyOTMwLDE4IEBAIG1vel9ndGtfZ2V0X2Rvd25hcnJvd19zaXplKGdp bnQqIHdpZHRoLCBnaW50KiBoZWlnaHQpCiBnaW50CiBtb3pfZ3RrX2dldF90b29sYmFyX3NlcGFy YXRvcl93aWR0aChnaW50KiBzaXplKQogewotICAgIGdib29sZWFuIHdpZGVfc2VwYXJhdG9ycyA9 IEZBTFNFOwotICAgIGdpbnQgc2VwYXJhdG9yX3dpZHRoID0gMDsKKyAgICBnYm9vbGVhbiB3aWRl X3NlcGFyYXRvcnM7CisgICAgZ2ludCBzZXBhcmF0b3Jfd2lkdGg7CiAgICAgR3RrU3R5bGUqIHN0 eWxlOwogCiAgICAgZW5zdXJlX3Rvb2xiYXJfd2lkZ2V0KCk7CiAKICAgICBzdHlsZSA9IGdUb29s YmFyV2lkZ2V0LT5zdHlsZTsKIAotICAgIGlmIChoYXZlXzJfMTApCi0gICAgICAgIGd0a193aWRn ZXRfc3R5bGVfZ2V0KGdUb29sYmFyV2lkZ2V0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAid2lkZS1zZXBhcmF0b3JzIiwgICZ3aWRlX3NlcGFyYXRvcnMsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICJzZXBhcmF0b3Itd2lkdGgiLCAmc2VwYXJhdG9yX3dpZHRoLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBOVUxMKTsKLQogICAgIGd0a193aWRnZXRfc3R5bGVfZ2V0 KGdUb29sYmFyV2lkZ2V0LAogICAgICAgICAgICAgICAgICAgICAgICAgICJzcGFjZS1zaXplIiwg c2l6ZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAid2lkZS1zZXBhcmF0b3JzIiwgICZ3aWRl X3NlcGFyYXRvcnMsCisgICAgICAgICAgICAgICAgICAgICAgICAgInNlcGFyYXRvci13aWR0aCIs ICZzZXBhcmF0b3Jfd2lkdGgsCiAgICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCk7CiAKICAg ICAvKiBKdXN0IGluIGNhc2UuLi4gKi8KQEAgLTI5NzMsMTYgKzI5NzUsMTUgQEAgbW96X2d0a19n ZXRfdHJlZXZpZXdfZXhwYW5kZXJfc2l6ZShnaW50KiBzaXplKQogZ2ludAogbW96X2d0a19nZXRf bWVudV9zZXBhcmF0b3JfaGVpZ2h0KGdpbnQgKnNpemUpCiB7Ci0gICAgZ2Jvb2xlYW4gd2lkZV9z ZXBhcmF0b3JzID0gRkFMU0U7Ci0gICAgZ2ludCAgICAgc2VwYXJhdG9yX2hlaWdodCA9IDA7Cisg ICAgZ2Jvb2xlYW4gd2lkZV9zZXBhcmF0b3JzOworICAgIGdpbnQgICAgIHNlcGFyYXRvcl9oZWln aHQ7CiAKICAgICBlbnN1cmVfbWVudV9zZXBhcmF0b3Jfd2lkZ2V0KCk7CiAKLSAgICBpZiAoaGF2 ZV8yXzEwKQotICAgICAgICBndGtfd2lkZ2V0X3N0eWxlX2dldChnTWVudVNlcGFyYXRvcldpZGdl dCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ3aWRlLXNlcGFyYXRvcnMiLCAgJndp ZGVfc2VwYXJhdG9ycywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJzZXBhcmF0b3It aGVpZ2h0IiwgJnNlcGFyYXRvcl9oZWlnaHQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBOVUxMKTsKKyAgICBndGtfd2lkZ2V0X3N0eWxlX2dldChnTWVudVNlcGFyYXRvcldpZGdldCwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgIndpZGUtc2VwYXJhdG9ycyIsICAmd2lkZV9zZXBh cmF0b3JzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAic2VwYXJhdG9yLWhlaWdodCIsICZz ZXBhcmF0b3JfaGVpZ2h0LAorICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMKTsKIAogICAg IGlmICh3aWRlX3NlcGFyYXRvcnMpCiAgICAgICAgICpzaXplID0gc2VwYXJhdG9yX2hlaWdodCAr IGdNZW51U2VwYXJhdG9yV2lkZ2V0LT5zdHlsZS0+eXRoaWNrbmVzczsKQEAgLTMwNjEsNyArMzA2 Miw4IEBAIG1vel9ndGtfd2lkZ2V0X3BhaW50KEd0a1RoZW1lV2lkZ2V0VHlwZSB3aWRnZXQsIEdk a0RyYXdhYmxlKiBkcmF3YWJsZSwKICAgICBjYXNlIE1PWl9HVEtfQ0hFQ0tCVVRUT046CiAgICAg Y2FzZSBNT1pfR1RLX1JBRElPQlVUVE9OOgogICAgICAgICByZXR1cm4gbW96X2d0a190b2dnbGVf cGFpbnQoZHJhd2FibGUsIHJlY3QsIGNsaXByZWN0LCBzdGF0ZSwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChnYm9vbGVhbikgZmxhZ3MsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAhIShmbGFncyAmIE1PWl9HVEtfV0lER0VUX0NIRUNLRUQpLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgISEoZmxhZ3MgJiBNT1pfR1RLX1dJREdF VF9JTkNPTlNJU1RFTlQpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHdp ZGdldCA9PSBNT1pfR1RLX1JBRElPQlVUVE9OKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGRpcmVjdGlvbik7CiAgICAgICAgIGJyZWFrOwpAQCAtMzI2Miw2ICszMjY0LDcg QEAgbW96X2d0a19zaHV0ZG93bigpCiAgICAgICAgIGd0a193aWRnZXRfZGVzdHJveShnUHJvdG9X aW5kb3cpOwogCiAgICAgZ1Byb3RvV2luZG93ID0gTlVMTDsKKyAgICBnUHJvdG9MYXlvdXQgPSBO VUxMOwogICAgIGdCdXR0b25XaWRnZXQgPSBOVUxMOwogICAgIGdUb2dnbGVCdXR0b25XaWRnZXQg PSBOVUxMOwogICAgIGdCdXR0b25BcnJvd1dpZGdldCA9IE5VTEw7CmRpZmYgLS1naXQgYS9XZWJD b3JlL3BsYXRmb3JtL2d0ay9ndGtkcmF3aW5nLmggYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9ndGtk cmF3aW5nLmgKaW5kZXggZWI2OTk1YS4uMWEzM2JmYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0 Zm9ybS9ndGsvZ3RrZHJhd2luZy5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL2d0a2RyYXdp bmcuaApAQCAtMTEwLDYgKzExMCwxMCBAQCB0eXBlZGVmIGdpbnQgKCpzdHlsZV9wcm9wX3QpKEd0 a1N0eWxlKiwgY29uc3QgZ2NoYXIqLCBnaW50KTsKICNkZWZpbmUgTU9aX0dUS19VTktOT1dOX1dJ REdFVCAtMQogI2RlZmluZSBNT1pfR1RLX1VOU0FGRV9USEVNRSAtMgogCisvKioqIGNoZWNrYm94 L3JhZGlvIGZsYWdzICoqKi8KKyNkZWZpbmUgTU9aX0dUS19XSURHRVRfQ0hFQ0tFRCAxCisjZGVm aW5lIE1PWl9HVEtfV0lER0VUX0lOQ09OU0lTVEVOVCAoMSA8PCAxKQorCiAvKioqIHdpZGdldCB0 eXBlIGNvbnN0YW50cyAqKiovCiB0eXBlZGVmIGVudW0gewogICAvKiBQYWludHMgYSBHdGtCdXR0 b24uIGZsYWdzIGlzIGEgR3RrUmVsaWVmU3R5bGUuICovCg==