110776 2013-02-25 11:36:46 -0800 More style cleanup in GIFImageReader 2013-02-27 19:11:53 -0800 1 1 1 Unclassified WebKit Images 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 98098 1 hclam hclam senorblanco webkit.review.bot oldest_to_newest 841149 0 hclam 2013-02-25 11:36:46 -0800 This include some variables renaming. 841151 1 190099 hclam 2013-02-25 11:40:01 -0800 Created attachment 190099 Patch 841184 2 190099 allan.jensen 2013-02-25 12:22:52 -0800 Comment on attachment 190099 Patch LGTM 841456 3 190099 webkit.review.bot 2013-02-25 17:35:47 -0800 Comment on attachment 190099 Patch Rejecting attachment 190099 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=gce-cq-02', 'apply-attachment', '--no-update', '--non-interactive', 190099, '--port=chromium-xvfb']" exit_code: 2 cwd: /mnt/git/webkit-commit-queue Last 500 characters of output: d at 657 (offset 35 lines). Hunk #15 succeeded at 666 (offset 35 lines). Hunk #16 succeeded at 695 (offset 35 lines). Hunk #17 succeeded at 762 (offset 36 lines). Hunk #18 FAILED at 752. Hunk #19 FAILED at 793. 5 out of 19 hunks FAILED -- saving rejects to file Source/WebCore/platform/image-decoders/gif/GIFImageReader.cpp.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', '--force', '--reviewer', 'Allan Sandfeld Jensen']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue Full output: http://queues.webkit.org/results/16748622 843645 4 hclam 2013-02-27 19:11:53 -0800 Committed r144257: <http://trac.webkit.org/changeset/144257> 190099 2013-02-25 11:40:01 -0800 2013-02-25 17:35:47 -0800 Patch bug-110776-20130225113617.patch text/plain 13493 hclam U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzOTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTljYzkxZTI4Njg2ODA0 YTc2OWIxZjg2MWZhZjMwYTIxZGI5ODg1Ny4uOTFkZDk0NjU1MTcyMWE5MzE0MjE4Y2ZiM2I0ZDcx MGZlMWJjMzQzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTAyLTI1ICBBbHBo YSBMYW0gIDxoY2xhbUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTW9yZSBzdHlsZSBjbGVhbnVw IGluIEdJRkltYWdlUmVhZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMTA3NzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBSZW5hbWVkIHZhcmlhYmxlIHEgdG8gY3VycmVudENvbXBvbmVudCB3aGljaCBt b3JlIGFjY3VyYXRlbHkgcmVwcmVzZW50CisgICAgICAgIHRoZSBwdXJwb3NlLgorCisgICAgICAg IE5vIHRlc3QuIFNpbXBsZSByZWZhY3RvcmluZy4KKworICAgICAgICAqIHBsYXRmb3JtL2ltYWdl LWRlY29kZXJzL2dpZi9HSUZJbWFnZVJlYWRlci5jcHA6CisgICAgICAgIChHSUZJbWFnZVJlYWRl cjo6ZGVjb2RlSW50ZXJuYWwpOgorCiAyMDEzLTAyLTI1ICBNYXJpdXN6IEdyemVnb3JjenlrICA8 bWFyaXVzei5nQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdW0dUS10gTW92ZSB0ZXh0IHNl bGVjdGlvbi9mb2N1cyBub3RpZmljYXRpb24gZm9yIGExMXkgZnJvbSBndGsgdG8gYXRrIGRpcmVj dG9yeQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMv Z2lmL0dJRkltYWdlUmVhZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRl Y29kZXJzL2dpZi9HSUZJbWFnZVJlYWRlci5jcHAKaW5kZXggY2NlMDY5ZmUyYzQ5MTQ0MDc4MDhm NWFmYzRmMjUxYjNhNDg0MWM3My4uY2U1NTg4YmFjMDFkNzA3NTJmY2EwZDI0MWViZWM3NGEzZDg1 OWMwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMv Z2lmL0dJRkltYWdlUmVhZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFn ZS1kZWNvZGVycy9naWYvR0lGSW1hZ2VSZWFkZXIuY3BwCkBAIC0zNzQsMTAgKzM3NCw5IEBAIGJv b2wgR0lGSW1hZ2VSZWFkZXI6OmRlY29kZUludGVybmFsKHNpemVfdCBkYXRhUG9zaXRpb24sIHNp emVfdCBsZW4sIEdJRkltYWdlRGVjCiAgICAgLy8gQXQgdGhlIGJlZ2lubmluZyBvZiBlYWNoIGl0 ZXJhdGlvbiwgZGF0YVBvc2l0aW9uIHdpbGwgYmUgYWR2YW5jZWQgYnkgbV9ieXRlc1RvQ29uc3Vt ZSB0bwogICAgIC8vIHBvaW50IHRvIHRoZSBuZXh0IGNvbXBvbmVudC4gbGVuIHdpbGwgYmUgZGVj cmVtZW50ZWQgYWNjb3JkaW5nbHkuCiAgICAgd2hpbGUgKGxlbiA+PSBtX2J5dGVzVG9Db25zdW1l KSB7Ci0gICAgICAgIC8vIEZJWE1FOiBSZW5hbWUgdGhpcyB2YXJpYWJsZSB0byBjdXJyZW50Q29t cG9uZW50LgotICAgICAgICBjb25zdCB1bnNpZ25lZCBjaGFyKiBxID0gZGF0YShkYXRhUG9zaXRp b24pOworICAgICAgICBjb25zdCB1bnNpZ25lZCBjaGFyKiBjdXJyZW50Q29tcG9uZW50ID0gZGF0 YShkYXRhUG9zaXRpb24pOwogCi0gICAgICAgIC8vIE1hcmsgdGhlIGN1cnJlbnQgY29tcG9uZW50 IGFzIGNvbnN1bWVkLiBOb3RlIHRoYXQgcSB3aWxsIHJlbWFpbiBwb2ludGVkIGF0IHRoaXMKKyAg ICAgICAgLy8gTWFyayB0aGUgY3VycmVudCBjb21wb25lbnQgYXMgY29uc3VtZWQuIE5vdGUgdGhh dCBjdXJyZW50Q29tcG9uZW50IHdpbGwgcmVtYWluIHBvaW50ZWQgYXQgdGhpcwogICAgICAgICAv LyBjb21wb25lbnQgdW50aWwgdGhlIG5leHQgbG9vcCBpdGVyYXRpb24uCiAgICAgICAgIGRhdGFQ b3NpdGlvbiArPSBtX2J5dGVzVG9Db25zdW1lOwogICAgICAgICBsZW4gLT0gbV9ieXRlc1RvQ29u c3VtZTsKQEAgLTM4NSwxNCArMzg0LDE0IEBAIGJvb2wgR0lGSW1hZ2VSZWFkZXI6OmRlY29kZUlu dGVybmFsKHNpemVfdCBkYXRhUG9zaXRpb24sIHNpemVfdCBsZW4sIEdJRkltYWdlRGVjCiAgICAg ICAgIHN3aXRjaCAobV9zdGF0ZSkgewogICAgICAgICBjYXNlIEdJRkxaVzoKICAgICAgICAgICAg IC8vIG1fYnl0ZXNUb0NvbnN1bWUgaXMgdGhlIGN1cnJlbnQgY29tcG9uZW50IHNpemUgYmVjYXVz ZSBpdCBoYXNuJ3QgYmVlbiB1cGRhdGVkLgotICAgICAgICAgICAgaWYgKCFkb0xaVyhxLCBtX2J5 dGVzVG9Db25zdW1lKSkKKyAgICAgICAgICAgIGlmICghZG9MWlcoY3VycmVudENvbXBvbmVudCwg bV9ieXRlc1RvQ29uc3VtZSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOyAvLyBJZiBk b0xaVygpIGVuY291bnRlcmVkIGFuIGVycm9yLCBpdCBoYXMgYWxyZWFkeSBjYWxsZWQgbV9jbGll bnQtPnNldEZhaWxlZCgpLgogICAgICAgICAgICAgR0VUTigxLCBHSUZTdWJCbG9jayk7CiAgICAg ICAgICAgICBicmVhazsKIAogICAgICAgICBjYXNlIEdJRkxaV1N0YXJ0OiB7CiAgICAgICAgICAg ICAvLyBJbml0aWFsaXplIExaVyBwYXJzZXIvZGVjb2Rlci4KLSAgICAgICAgICAgIGludCBkYXRh c2l6ZSA9ICpxOworICAgICAgICAgICAgaW50IGRhdGFzaXplID0gKmN1cnJlbnRDb21wb25lbnQ7 CiAKICAgICAgICAgICAgIC8vIFNpbmNlIHdlIHVzZSBhIGNvZGVzaXplIG9mIDEgbW9yZSB0aGFu IHRoZSBkYXRhc2l6ZSwgd2UgbmVlZCB0byBlbnN1cmUKICAgICAgICAgICAgIC8vIHRoYXQgb3Vy IGRhdGFzaXplIGlzIHN0cmljdGx5IGxlc3MgdGhhbiB0aGUgTUFYX0xaV19CSVRTIHZhbHVlICgx MikuCkBAIC00MzIsOSArNDMxLDkgQEAgYm9vbCBHSUZJbWFnZVJlYWRlcjo6ZGVjb2RlSW50ZXJu YWwoc2l6ZV90IGRhdGFQb3NpdGlvbiwgc2l6ZV90IGxlbiwgR0lGSW1hZ2VEZWMKIAogICAgICAg ICBjYXNlIEdJRlR5cGU6IHsKICAgICAgICAgICAgIC8vIEFsbCBHSUYgZmlsZXMgYmVnaW4gd2l0 aCAiR0lGODdhIiBvciAiR0lGODlhIi4KLSAgICAgICAgICAgIGlmICghc3RybmNtcCgoY2hhciop cSwgIkdJRjg5YSIsIDYpKQorICAgICAgICAgICAgaWYgKCFzdHJuY21wKChjaGFyKiljdXJyZW50 Q29tcG9uZW50LCAiR0lGODlhIiwgNikpCiAgICAgICAgICAgICAgICAgbV92ZXJzaW9uID0gODk7 Ci0gICAgICAgICAgICBlbHNlIGlmICghc3RybmNtcCgoY2hhciopcSwgIkdJRjg3YSIsIDYpKQor ICAgICAgICAgICAgZWxzZSBpZiAoIXN0cm5jbXAoKGNoYXIqKWN1cnJlbnRDb21wb25lbnQsICJH SUY4N2EiLCA2KSkKICAgICAgICAgICAgICAgICBtX3ZlcnNpb24gPSA4NzsKICAgICAgICAgICAg IGVsc2UKICAgICAgICAgICAgICAgICByZXR1cm4gbV9jbGllbnQgPyBtX2NsaWVudC0+c2V0RmFp bGVkKCkgOiBmYWxzZTsKQEAgLTQ0NiwxNyArNDQ1LDE3IEBAIGJvb2wgR0lGSW1hZ2VSZWFkZXI6 OmRlY29kZUludGVybmFsKHNpemVfdCBkYXRhUG9zaXRpb24sIHNpemVfdCBsZW4sIEdJRkltYWdl RGVjCiAgICAgICAgICAgICAvLyBUaGlzIGlzIHRoZSBoZWlnaHQgYW5kIHdpZHRoIG9mIHRoZSAi c2NyZWVuIiBvciBmcmFtZSBpbnRvIHdoaWNoIGltYWdlcyBhcmUgcmVuZGVyZWQuIFRoZQogICAg ICAgICAgICAgLy8gaW5kaXZpZHVhbCBpbWFnZXMgY2FuIGJlIHNtYWxsZXIgdGhhbiB0aGUgc2Ny ZWVuIHNpemUgYW5kIGxvY2F0ZWQgd2l0aCBhbiBvcmlnaW4gYW55d2hlcmUKICAgICAgICAgICAg IC8vIHdpdGhpbiB0aGUgc2NyZWVuLgotICAgICAgICAgICAgbV9zY3JlZW5XaWR0aCA9IEdFVElO VDE2KHEpOwotICAgICAgICAgICAgbV9zY3JlZW5IZWlnaHQgPSBHRVRJTlQxNihxICsgMik7Cisg ICAgICAgICAgICBtX3NjcmVlbldpZHRoID0gR0VUSU5UMTYoY3VycmVudENvbXBvbmVudCk7Cisg ICAgICAgICAgICBtX3NjcmVlbkhlaWdodCA9IEdFVElOVDE2KGN1cnJlbnRDb21wb25lbnQgKyAy KTsKIAogICAgICAgICAgICAgLy8gQ0FMTEJBQ0s6IEluZm9ybSB0aGUgZGVjb2RlcnBsdWdpbiBv ZiBvdXIgc2l6ZS4KICAgICAgICAgICAgIGlmIChtX2NsaWVudCAmJiAhbV9jbGllbnQtPnNldFNp emUobV9zY3JlZW5XaWR0aCwgbV9zY3JlZW5IZWlnaHQpKQogICAgICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKIAotICAgICAgICAgICAgbV9zY3JlZW5CZ2NvbG9yID0gcVs1XTsKLSAgICAgICAg ICAgIG1fZ2xvYmFsQ29sb3JtYXBTaXplID0gMiA8PCAocVs0XSAmIDB4MDcpOworICAgICAgICAg ICAgbV9zY3JlZW5CZ2NvbG9yID0gY3VycmVudENvbXBvbmVudFs1XTsKKyAgICAgICAgICAgIG1f Z2xvYmFsQ29sb3JtYXBTaXplID0gMiA8PCAoY3VycmVudENvbXBvbmVudFs0XSAmIDB4MDcpOwog Ci0gICAgICAgICAgICBpZiAoKHFbNF0gJiAweDgwKSAmJiBtX2dsb2JhbENvbG9ybWFwU2l6ZSA+ IDApIHsgLyogZ2xvYmFsIG1hcCAqLworICAgICAgICAgICAgaWYgKChjdXJyZW50Q29tcG9uZW50 WzRdICYgMHg4MCkgJiYgbV9nbG9iYWxDb2xvcm1hcFNpemUgPiAwKSB7IC8qIGdsb2JhbCBtYXAg Ki8KICAgICAgICAgICAgICAgICAvLyBHZXQgdGhlIGdsb2JhbCBjb2xvcm1hcAogICAgICAgICAg ICAgICAgIGNvbnN0IHNpemVfdCBnbG9iYWxDb2xvcm1hcEJ5dGVzID0gMyAqIG1fZ2xvYmFsQ29s b3JtYXBTaXplOwogICAgICAgICAgICAgICAgIG1fZ2xvYmFsQ29sb3JtYXBQb3NpdGlvbiA9IGRh dGFQb3NpdGlvbjsKQEAgLTQ3NCw5ICs0NzMsOSBAQCBib29sIEdJRkltYWdlUmVhZGVyOjpkZWNv ZGVJbnRlcm5hbChzaXplX3QgZGF0YVBvc2l0aW9uLCBzaXplX3QgbGVuLCBHSUZJbWFnZURlYwog CiAgICAgICAgICAgICBHRVROKDEsIEdJRkltYWdlU3RhcnQpOwogCi0gICAgICAgICAgICAvLyBx WzZdID0gUGl4ZWwgQXNwZWN0IFJhdGlvCisgICAgICAgICAgICAvLyBjdXJyZW50Q29tcG9uZW50 WzZdID0gUGl4ZWwgQXNwZWN0IFJhdGlvCiAgICAgICAgICAgICAvLyAgIE5vdCB1c2VkCi0gICAg ICAgICAgICAvLyAgIGZsb2F0IGFzcGVjdCA9IChmbG9hdCkoKHFbNl0gKyAxNSkgLyA2NC4wKTsK KyAgICAgICAgICAgIC8vICAgZmxvYXQgYXNwZWN0ID0gKGZsb2F0KSgoY3VycmVudENvbXBvbmVu dFs2XSArIDE1KSAvIDY0LjApOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KIApAQCAt NDg3LDEyICs0ODYsMTIgQEAgYm9vbCBHSUZJbWFnZVJlYWRlcjo6ZGVjb2RlSW50ZXJuYWwoc2l6 ZV90IGRhdGFQb3NpdGlvbiwgc2l6ZV90IGxlbiwgR0lGSW1hZ2VEZWMKICAgICAgICAgfQogCiAg ICAgICAgIGNhc2UgR0lGSW1hZ2VTdGFydDogewotICAgICAgICAgICAgaWYgKCpxID09ICc7Jykg eyAvLyB0ZXJtaW5hdG9yLgorICAgICAgICAgICAgaWYgKCpjdXJyZW50Q29tcG9uZW50ID09ICc7 JykgeyAvLyB0ZXJtaW5hdG9yLgogICAgICAgICAgICAgICAgIEdFVE4oMCwgR0lGRG9uZSk7CiAg ICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGlmICgq cSA9PSAnIScpIHsgLy8gZXh0ZW5zaW9uLgorICAgICAgICAgICAgaWYgKCpjdXJyZW50Q29tcG9u ZW50ID09ICchJykgeyAvLyBleHRlbnNpb24uCiAgICAgICAgICAgICAgICAgR0VUTigyLCBHSUZF eHRlbnNpb24pOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQpAQCAtNTAy LDcgKzUwMSw3IEBAIGJvb2wgR0lGSW1hZ2VSZWFkZXI6OmRlY29kZUludGVybmFsKHNpemVfdCBk YXRhUG9zaXRpb24sIHNpemVfdCBsZW4sIEdJRkltYWdlRGVjCiAgICAgICAgICAgICAvLyBiZXR3 ZWVuIGJsb2Nrcy4gVGhlIEdJRjg3YSBzcGVjIHRlbGxzIHVzIHRvIGtlZXAgcmVhZGluZwogICAg ICAgICAgICAgLy8gdW50aWwgd2UgZmluZCBhbiBpbWFnZSBzZXBhcmF0b3IsIGJ1dCBHSUY4OWEg c2F5cyBzdWNoCiAgICAgICAgICAgICAvLyBhIGZpbGUgaXMgY29ycnVwdC4gV2UgZm9sbG93IEdJ Rjg5YSBhbmQgYmFpbCBvdXQuCi0gICAgICAgICAgICBpZiAoKnEgIT0gJywnKQorICAgICAgICAg ICAgaWYgKCpjdXJyZW50Q29tcG9uZW50ICE9ICcsJykKICAgICAgICAgICAgICAgICByZXR1cm4g bV9jbGllbnQgPyBtX2NsaWVudC0+c2V0RmFpbGVkKCkgOiBmYWxzZTsKIAogICAgICAgICAgICAg R0VUTig5LCBHSUZJbWFnZUhlYWRlcik7CkBAIC01MTAsNyArNTA5LDcgQEAgYm9vbCBHSUZJbWFn ZVJlYWRlcjo6ZGVjb2RlSW50ZXJuYWwoc2l6ZV90IGRhdGFQb3NpdGlvbiwgc2l6ZV90IGxlbiwg R0lGSW1hZ2VEZWMKICAgICAgICAgfQogCiAgICAgICAgIGNhc2UgR0lGRXh0ZW5zaW9uOiB7Ci0g ICAgICAgICAgICBzaXplX3QgYnl0ZXNJbkJsb2NrID0gcVsxXTsKKyAgICAgICAgICAgIHNpemVf dCBieXRlc0luQmxvY2sgPSBjdXJyZW50Q29tcG9uZW50WzFdOwogICAgICAgICAgICAgR0lGU3Rh dGUgZXMgPSBHSUZTa2lwQmxvY2s7CiAKICAgICAgICAgICAgIC8vIFRoZSBHSUYgc3BlYyBtYW5k YXRlcyBsZW5ndGhzIGZvciB0aHJlZSBvZiB0aGUgZXh0ZW5zaW9ucyBiZWxvdy4KQEAgLTUyOCw3 ICs1MjcsNyBAQCBib29sIEdJRkltYWdlUmVhZGVyOjpkZWNvZGVJbnRlcm5hbChzaXplX3QgZGF0 YVBvc2l0aW9uLCBzaXplX3QgbGVuLCBHSUZJbWFnZURlYwogICAgICAgICAgICAgLy8gYnl0ZXMg YXZhaWxhYmxlLCBhbmQgaWYgd2UgZG9uJ3QgZW5zdXJlIHRoYXQsIHRoZXkgY291bGQgcmVhZCBv ZmYgdGhlCiAgICAgICAgICAgICAvLyBlbmQgb2YgdGhlIGhlYXAgYnVmZmVyLiAoSW4gdGhpcyBj YXNlLCBpdCdzIGxpa2VseSB0aGUgR0lGIGlzIGNvcnJ1cHQKICAgICAgICAgICAgIC8vIGFuZCB3 ZSdsbCBzb29uIGZhaWwgdG8gZGVjb2RlIGFueXdheS4pCi0gICAgICAgICAgICBzd2l0Y2ggKCpx KSB7CisgICAgICAgICAgICBzd2l0Y2ggKCpjdXJyZW50Q29tcG9uZW50KSB7CiAgICAgICAgICAg ICBjYXNlIDB4Zjk6CiAgICAgICAgICAgICAgICAgZXMgPSBHSUZDb250cm9sRXh0ZW5zaW9uOwog ICAgICAgICAgICAgICAgIGJ5dGVzSW5CbG9jayA9IHN0ZDo6bWF4KGJ5dGVzSW5CbG9jaywgc3Rh dGljX2Nhc3Q8c2l6ZV90Pig0KSk7CkBAIC01NTcsMTAgKzU1NiwxMCBAQCBib29sIEdJRkltYWdl UmVhZGVyOjpkZWNvZGVJbnRlcm5hbChzaXplX3QgZGF0YVBvc2l0aW9uLCBzaXplX3QgbGVuLCBH SUZJbWFnZURlYwogICAgICAgICB9CiAKICAgICAgICAgY2FzZSBHSUZDb25zdW1lQmxvY2s6IHsK LSAgICAgICAgICAgIGlmICghKnEpCisgICAgICAgICAgICBpZiAoISpjdXJyZW50Q29tcG9uZW50 KQogICAgICAgICAgICAgICAgIEdFVE4oMSwgR0lGSW1hZ2VTdGFydCk7CiAgICAgICAgICAgICBl bHNlCi0gICAgICAgICAgICAgICAgR0VUTigqcSwgR0lGU2tpcEJsb2NrKTsKKyAgICAgICAgICAg ICAgICBHRVROKCpjdXJyZW50Q29tcG9uZW50LCBHSUZTa2lwQmxvY2spOwogICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgIH0KIApAQCAtNTc2LDggKzU3NSw4IEBAIGJvb2wgR0lGSW1hZ2VSZWFk ZXI6OmRlY29kZUludGVybmFsKHNpemVfdCBkYXRhUG9zaXRpb24sIHNpemVfdCBsZW4sIEdJRklt YWdlRGVjCiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGlmIChtX2ZyYW1lQ29udGV4dCkg ewotICAgICAgICAgICAgICAgIGlmICgqcSAmIDB4MSkgewotICAgICAgICAgICAgICAgICAgICBt X2ZyYW1lQ29udGV4dC0+dHBpeGVsID0gcVszXTsKKyAgICAgICAgICAgICAgICBpZiAoKmN1cnJl bnRDb21wb25lbnQgJiAweDEpIHsKKyAgICAgICAgICAgICAgICAgICAgbV9mcmFtZUNvbnRleHQt PnRwaXhlbCA9IGN1cnJlbnRDb21wb25lbnRbM107CiAgICAgICAgICAgICAgICAgICAgIG1fZnJh bWVDb250ZXh0LT5pc1RyYW5zcGFyZW50ID0gdHJ1ZTsKICAgICAgICAgICAgICAgICB9IGVsc2Ug ewogICAgICAgICAgICAgICAgICAgICBtX2ZyYW1lQ29udGV4dC0+aXNUcmFuc3BhcmVudCA9IGZh bHNlOwpAQCAtNTg1LDIyICs1ODQsMjIgQEAgYm9vbCBHSUZJbWFnZVJlYWRlcjo6ZGVjb2RlSW50 ZXJuYWwoc2l6ZV90IGRhdGFQb3NpdGlvbiwgc2l6ZV90IGxlbiwgR0lGSW1hZ2VEZWMKICAgICAg ICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgLy8gTk9URTogVGhpcyByZWxpZXMgb24gdGhl IHZhbHVlcyBpbiB0aGUgRnJhbWVEaXNwb3NhbE1ldGhvZCBlbnVtCiAgICAgICAgICAgICAgICAg Ly8gbWF0Y2hpbmcgdGhvc2UgaW4gdGhlIEdJRiBzcGVjIQotICAgICAgICAgICAgICAgIGludCBk aXNwb3NhbE1ldGhvZCA9ICgoKnEpID4+IDIpICYgMHg3OworICAgICAgICAgICAgICAgIGludCBk aXNwb3NhbE1ldGhvZCA9ICgoKmN1cnJlbnRDb21wb25lbnQpID4+IDIpICYgMHg3OwogICAgICAg ICAgICAgICAgIG1fZnJhbWVDb250ZXh0LT5kaXNwb3NhbE1ldGhvZCA9IChXZWJDb3JlOjpJbWFn ZUZyYW1lOjpGcmFtZURpc3Bvc2FsTWV0aG9kKWRpc3Bvc2FsTWV0aG9kOwogCiAgICAgICAgICAg ICAgICAgLy8gU29tZSBzcGVjcyBzYXkgM3JkIGJpdCAodmFsdWUgNCksIG90aGVyIHNwZWNzIHNh eSB2YWx1ZSAzCiAgICAgICAgICAgICAgICAgLy8gTGV0J3MgY2hvb3NlIDMgKHRoZSBtb3JlIHBv cHVsYXIpCiAgICAgICAgICAgICAgICAgaWYgKGRpc3Bvc2FsTWV0aG9kID09IDQpCiAgICAgICAg ICAgICAgICAgICAgIG1fZnJhbWVDb250ZXh0LT5kaXNwb3NhbE1ldGhvZCA9IFdlYkNvcmU6Oklt YWdlRnJhbWU6OkRpc3Bvc2VPdmVyd3JpdGVQcmV2aW91czsKLSAgICAgICAgICAgICAgICBtX2Zy YW1lQ29udGV4dC0+ZGVsYXlUaW1lID0gR0VUSU5UMTYocSArIDEpICogMTA7CisgICAgICAgICAg ICAgICAgbV9mcmFtZUNvbnRleHQtPmRlbGF5VGltZSA9IEdFVElOVDE2KGN1cnJlbnRDb21wb25l bnQgKyAxKSAqIDEwOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgR0VUTigxLCBHSUZDb25z dW1lQmxvY2spOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KIAogICAgICAgICBjYXNl IEdJRkNvbW1lbnRFeHRlbnNpb246IHsKLSAgICAgICAgICAgIGlmICgqcSkKLSAgICAgICAgICAg ICAgICBHRVROKCpxLCBHSUZDb25zdW1lQ29tbWVudCk7CisgICAgICAgICAgICBpZiAoKmN1cnJl bnRDb21wb25lbnQpCisgICAgICAgICAgICAgICAgR0VUTigqY3VycmVudENvbXBvbmVudCwgR0lG Q29uc3VtZUNvbW1lbnQpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIEdFVE4o MSwgR0lGSW1hZ2VTdGFydCk7CiAgICAgICAgICAgICBicmVhazsKQEAgLTYxMyw3ICs2MTIsNyBA QCBib29sIEdJRkltYWdlUmVhZGVyOjpkZWNvZGVJbnRlcm5hbChzaXplX3QgZGF0YVBvc2l0aW9u LCBzaXplX3QgbGVuLCBHSUZJbWFnZURlYwogCiAgICAgICAgIGNhc2UgR0lGQXBwbGljYXRpb25F eHRlbnNpb246IHsKICAgICAgICAgICAgIC8vIENoZWNrIGZvciBuZXRzY2FwZSBhcHBsaWNhdGlv biBleHRlbnNpb24uCi0gICAgICAgICAgICBpZiAoIXN0cm5jbXAoKGNoYXIqKXEsICJORVRTQ0FQ RTIuMCIsIDExKSB8fCAhc3RybmNtcCgoY2hhciopcSwgIkFOSU1FWFRTMS4wIiwgMTEpKQorICAg ICAgICAgICAgaWYgKCFzdHJuY21wKChjaGFyKiljdXJyZW50Q29tcG9uZW50LCAiTkVUU0NBUEUy LjAiLCAxMSkgfHwgIXN0cm5jbXAoKGNoYXIqKWN1cnJlbnRDb21wb25lbnQsICJBTklNRVhUUzEu MCIsIDExKSkKICAgICAgICAgICAgICAgICBHRVROKDEsIEdJRk5ldHNjYXBlRXh0ZW5zaW9uQmxv Y2spOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIEdFVE4oMSwgR0lGQ29uc3Vt ZUJsb2NrKTsKQEAgLTYyMiw4ICs2MjEsOCBAQCBib29sIEdJRkltYWdlUmVhZGVyOjpkZWNvZGVJ bnRlcm5hbChzaXplX3QgZGF0YVBvc2l0aW9uLCBzaXplX3QgbGVuLCBHSUZJbWFnZURlYwogCiAg ICAgICAgIC8vIE5ldHNjYXBlLXNwZWNpZmljIEdJRiBleHRlbnNpb246IGFuaW1hdGlvbiBsb29w aW5nLgogICAgICAgICBjYXNlIEdJRk5ldHNjYXBlRXh0ZW5zaW9uQmxvY2s6IHsKLSAgICAgICAg ICAgIGlmICgqcSkKLSAgICAgICAgICAgICAgICBHRVROKCpxLCBHSUZDb25zdW1lTmV0c2NhcGVF eHRlbnNpb24pOworICAgICAgICAgICAgaWYgKCpjdXJyZW50Q29tcG9uZW50KQorICAgICAgICAg ICAgICAgIEdFVE4oKmN1cnJlbnRDb21wb25lbnQsIEdJRkNvbnN1bWVOZXRzY2FwZUV4dGVuc2lv bik7CiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgR0VUTigxLCBHSUZJbWFnZVN0 YXJ0KTsKICAgICAgICAgICAgIGJyZWFrOwpAQCAtNjMxLDExICs2MzAsMTEgQEAgYm9vbCBHSUZJ bWFnZVJlYWRlcjo6ZGVjb2RlSW50ZXJuYWwoc2l6ZV90IGRhdGFQb3NpdGlvbiwgc2l6ZV90IGxl biwgR0lGSW1hZ2VEZWMKIAogICAgICAgICAvLyBQYXJzZSBuZXRzY2FwZS1zcGVjaWZpYyBhcHBs aWNhdGlvbiBleHRlbnNpb25zCiAgICAgICAgIGNhc2UgR0lGQ29uc3VtZU5ldHNjYXBlRXh0ZW5z aW9uOiB7Ci0gICAgICAgICAgICBpbnQgbmV0c2NhcGVFeHRlbnNpb24gPSBxWzBdICYgNzsKKyAg ICAgICAgICAgIGludCBuZXRzY2FwZUV4dGVuc2lvbiA9IGN1cnJlbnRDb21wb25lbnRbMF0gJiA3 OwogCiAgICAgICAgICAgICAvLyBMb29wIGVudGlyZSBhbmltYXRpb24gc3BlY2lmaWVkICMgb2Yg dGltZXMuIE9ubHkgcmVhZCB0aGUgbG9vcCBjb3VudCBkdXJpbmcgdGhlIGZpcnN0IGl0ZXJhdGlv bi4KICAgICAgICAgICAgIGlmIChuZXRzY2FwZUV4dGVuc2lvbiA9PSAxKSB7Ci0gICAgICAgICAg ICAgICAgbV9sb29wQ291bnQgPSBHRVRJTlQxNihxICsgMSk7CisgICAgICAgICAgICAgICAgbV9s b29wQ291bnQgPSBHRVRJTlQxNihjdXJyZW50Q29tcG9uZW50ICsgMSk7CiAKICAgICAgICAgICAg ICAgICAvLyBaZXJvIGxvb3AgY291bnQgaXMgaW5maW5pdGUgYW5pbWF0aW9uIGxvb3AgcmVxdWVz dC4KICAgICAgICAgICAgICAgICBpZiAoIW1fbG9vcENvdW50KQpAQCAtNjYwLDEyICs2NTksMTIg QEAgYm9vbCBHSUZJbWFnZVJlYWRlcjo6ZGVjb2RlSW50ZXJuYWwoc2l6ZV90IGRhdGFQb3NpdGlv biwgc2l6ZV90IGxlbiwgR0lGSW1hZ2VEZWMKICAgICAgICAgICAgIHVuc2lnbmVkIGhlaWdodCwg d2lkdGgsIHhPZmZzZXQsIHlPZmZzZXQ7CiAKICAgICAgICAgICAgIC8qIEdldCBpbWFnZSBvZmZz ZXRzLCB3aXRoIHJlc3BlY3QgdG8gdGhlIHNjcmVlbiBvcmlnaW4gKi8KLSAgICAgICAgICAgIHhP ZmZzZXQgPSBHRVRJTlQxNihxKTsKLSAgICAgICAgICAgIHlPZmZzZXQgPSBHRVRJTlQxNihxICsg Mik7CisgICAgICAgICAgICB4T2Zmc2V0ID0gR0VUSU5UMTYoY3VycmVudENvbXBvbmVudCk7Cisg ICAgICAgICAgICB5T2Zmc2V0ID0gR0VUSU5UMTYoY3VycmVudENvbXBvbmVudCArIDIpOwogCiAg ICAgICAgICAgICAvKiBHZXQgaW1hZ2Ugd2lkdGggYW5kIGhlaWdodC4gKi8KLSAgICAgICAgICAg IHdpZHRoICA9IEdFVElOVDE2KHEgKyA0KTsKLSAgICAgICAgICAgIGhlaWdodCA9IEdFVElOVDE2 KHEgKyA2KTsKKyAgICAgICAgICAgIHdpZHRoICA9IEdFVElOVDE2KGN1cnJlbnRDb21wb25lbnQg KyA0KTsKKyAgICAgICAgICAgIGhlaWdodCA9IEdFVElOVDE2KGN1cnJlbnRDb21wb25lbnQgKyA2 KTsKIAogICAgICAgICAgICAgLyogV29yayBhcm91bmQgYnJva2VuIEdJRiBmaWxlcyB3aGVyZSB0 aGUgbG9naWNhbCBzY3JlZW4KICAgICAgICAgICAgICAqIHNpemUgaGFzIHdlaXJkIHdpZHRoIG9y IGhlaWdodC4gIFdlIGFzc3VtZSB0aGF0IEdJRjg3YQpAQCAtNzI2LDcgKzcyNSw3IEBAIGJvb2wg R0lGSW1hZ2VSZWFkZXI6OmRlY29kZUludGVybmFsKHNpemVfdCBkYXRhUG9zaXRpb24sIHNpemVf dCBsZW4sIEdJRkltYWdlRGVjCiAgICAgICAgICAgICAgICAgaWYgKG1fc2NyZWVuSGVpZ2h0IDwg aGVpZ2h0KQogICAgICAgICAgICAgICAgICAgICBtX3NjcmVlbkhlaWdodCA9IGhlaWdodDsKIAot ICAgICAgICAgICAgICAgIGlmIChxWzhdICYgMHg0MCkgeworICAgICAgICAgICAgICAgIGlmIChj dXJyZW50Q29tcG9uZW50WzhdICYgMHg0MCkgewogICAgICAgICAgICAgICAgICAgICBtX2ZyYW1l Q29udGV4dC0+aW50ZXJsYWNlZCA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAgIG1fZnJhbWVD b250ZXh0LT5pcGFzcyA9IDE7CiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKQEAgLTc1MiwxMiAr NzUxLDEyIEBAIGJvb2wgR0lGSW1hZ2VSZWFkZXI6OmRlY29kZUludGVybmFsKHNpemVfdCBkYXRh UG9zaXRpb24sIHNpemVfdCBsZW4sIEdJRkltYWdlRGVjCiAgICAgICAgICAgICAgICAgbV9mcmFt ZUNvbnRleHQtPnJvd2VuZCA9IG1fZnJhbWVDb250ZXh0LT5yb3didWYgKyBtX2ZyYW1lQ29udGV4 dC0+d2lkdGg7CiAgICAgICAgICAgICAgICAgbV9mcmFtZUNvbnRleHQtPnJvd3AgPSBtX2ZyYW1l Q29udGV4dC0+cm93YnVmOwogCi0gICAgICAgICAgICAgICAgLy8gYml0cyBwZXIgcGl4ZWwgaXMg cVs4XSYweDA3CisgICAgICAgICAgICAgICAgLy8gYml0cyBwZXIgcGl4ZWwgaXMgY3VycmVudENv bXBvbmVudFs4XSYweDA3CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIC8vIGhhcyBhIGxv Y2FsIGNvbG9ybWFwPwotICAgICAgICAgICAgaWYgKHFbOF0gJiAweDgwKSB7Ci0gICAgICAgICAg ICAgICAgaW50IG51bUNvbG9ycyA9IDIgPDwgKHFbOF0gJiAweDcpOworICAgICAgICAgICAgaWYg KGN1cnJlbnRDb21wb25lbnRbOF0gJiAweDgwKSB7CisgICAgICAgICAgICAgICAgaW50IG51bUNv bG9ycyA9IDIgPDwgKGN1cnJlbnRDb21wb25lbnRbOF0gJiAweDcpOwogICAgICAgICAgICAgICAg IGNvbnN0IHNpemVfdCBsb2NhbENvbG9ybWFwQnl0ZXMgPSAzICogbnVtQ29sb3JzOwogCiAgICAg ICAgICAgICAgICAgLy8gU3dpdGNoIHRvIHRoZSBuZXcgbG9jYWwgcGFsZXR0ZSBhZnRlciBpdCBs b2FkcwpAQCAtNzkzLDcgKzc5Miw3IEBAIGJvb2wgR0lGSW1hZ2VSZWFkZXI6OmRlY29kZUludGVy bmFsKHNpemVfdCBkYXRhUG9zaXRpb24sIHNpemVfdCBsZW4sIEdJRkltYWdlRGVjCiAKICAgICAg ICAgY2FzZSBHSUZTdWJCbG9jazogewogICAgICAgICAgICAgLy8gU3RpbGwgd29ya2luZyBvbiB0 aGUgc2FtZSBpbWFnZTogUHJvY2VzcyBuZXh0IExaVyBkYXRhIGJsb2NrLgotICAgICAgICAgICAg Y29uc3Qgc2l6ZV90IGJ5dGVzSW5CbG9jayA9ICpxOworICAgICAgICAgICAgY29uc3Qgc2l6ZV90 IGJ5dGVzSW5CbG9jayA9ICpjdXJyZW50Q29tcG9uZW50OwogICAgICAgICAgICAgaWYgKGJ5dGVz SW5CbG9jaykgewogICAgICAgICAgICAgICAgIC8vIE1ha2Ugc3VyZSB0aGVyZSBhcmUgc3RpbGwg cm93cyBsZWZ0LiBJZiB0aGUgR0lGIGRhdGEKICAgICAgICAgICAgICAgICAvLyBpcyBjb3JydXB0 LCB3ZSBtYXkgbm90IGdldCBhbiBleHBsaWNpdCB0ZXJtaW5hdG9yLgo=