57894 2011-04-05 15:40:29 -0700 Rename variables in border drawing code for readability 2011-04-05 15:51:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser simon.fraser webkit.review.bot oldest_to_newest 379914 0 simon.fraser 2011-04-05 15:40:29 -0700 Rename variables in border drawing code for readability 379915 1 88321 simon.fraser 2011-04-05 15:41:04 -0700 Created attachment 88321 Patch 379916 2 webkit.review.bot 2011-04-05 15:42:08 -0700 Attachment 88321 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style']" exit_code: 1 Source/WebCore/rendering/RenderObject.cpp:740: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 1 in 2 files Source/WebCore/rendering/RenderObject.cpp:740: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 379926 3 simon.fraser 2011-04-05 15:51:06 -0700 http://trac.webkit.org/changeset/82995 88321 2011-04-05 15:41:04 -0700 2011-04-05 15:43:28 -0700 Patch bug-57894-20110405154103.patch text/plain 24732 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogODI5NjkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhYWM0YzE5N2U2NTNhOWE3 ODE5YzE0NzFkMGFhZTA4MWVmNmI2MDBlLi5kYTQwNjIyNzI5MzcxNTgyNTAzOGRjNjg1YTFjYzAx ZmIxMWY2MWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMTEtMDQtMDUgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVuYW1lIHZhcmlhYmxlcyBpbiBib3JkZXIgZHJh d2luZyBjb2RlIGZvciByZWFkYWJpbGl0eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTc4OTQKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmpl Y3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjpkcmF3TGluZUZvckJveFNp ZGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjpkcmF3Qm94U2lkZUZyb21QYXRo KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6ZHJhd0FyY0ZvckJveFNpZGUpOgor CisyMDExLTA0LTA1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCiAg ICAgICAgIFJldmlld2VkIGJ5IEFkZWxlIFBldGVyc29uLgogCiAgICAgICAgIEFkZCBhIGZhc3Qg cGF0aCBmb3Igc2ltcGxlIGNvbG9yIGJhY2tncm91bmRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJPYmplY3QuY3BwCmluZGV4IDUwYmVlOTVjZjkxMGU2ZmZmYzFiMjc3YzYxMWM4Yzlk ZmQxMWY5ODAuLjBjODkwOWY1OGE5NDJjMzU2NzdjMWM0NmRmZTgzMGE5YTBjMjAxMzMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCkBAIC03MDQsMTAgKzcwNCwx MCBAQCBib29sIFJlbmRlck9iamVjdDo6bXVzdFJlcGFpbnRCYWNrZ3JvdW5kT3JCb3JkZXIoKSBj b25zdAogfQogCiB2b2lkIFJlbmRlck9iamVjdDo6ZHJhd0xpbmVGb3JCb3hTaWRlKEdyYXBoaWNz Q29udGV4dCogZ3JhcGhpY3NDb250ZXh0LCBpbnQgeDEsIGludCB5MSwgaW50IHgyLCBpbnQgeTIs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEJveFNpZGUgcywgQ29sb3Ig YywgRUJvcmRlclN0eWxlIHN0eWxlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBpbnQgYWRqYncxLCBpbnQgYWRqYncyKQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBCb3hTaWRlIHNpZGUsIENvbG9yIGNvbG9yLCBFQm9yZGVyU3R5bGUgc3R5bGUs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCBhZGphY2VudFdpZHRo MSwgaW50IGFkamFjZW50V2lkdGgyKQogewotICAgIGludCB3aWR0aCA9IChzID09IEJTVG9wIHx8 IHMgPT0gQlNCb3R0b20gPyB5MiAtIHkxIDogeDIgLSB4MSk7CisgICAgaW50IHdpZHRoID0gKHNp ZGUgPT0gQlNUb3AgfHwgc2lkZSA9PSBCU0JvdHRvbSA/IHkyIC0geTEgOiB4MiAtIHgxKTsKIAog ICAgIGlmIChzdHlsZSA9PSBET1VCTEUgJiYgd2lkdGggPCAzKQogICAgICAgICBzdHlsZSA9IFNP TElEOwpAQCAtNzE4LDEyICs3MTgsMTIgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OmRyYXdMaW5lRm9y Qm94U2lkZShHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4dCwgaW50IHgxLAogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICBjYXNlIERPVFRFRDoKICAgICAgICAgY2FzZSBEQVNIRUQ6 Ci0gICAgICAgICAgICBncmFwaGljc0NvbnRleHQtPnNldFN0cm9rZUNvbG9yKGMsIG1fc3R5bGUt PmNvbG9yU3BhY2UoKSk7CisgICAgICAgICAgICBncmFwaGljc0NvbnRleHQtPnNldFN0cm9rZUNv bG9yKGNvbG9yLCBtX3N0eWxlLT5jb2xvclNwYWNlKCkpOwogICAgICAgICAgICAgZ3JhcGhpY3ND b250ZXh0LT5zZXRTdHJva2VUaGlja25lc3Mod2lkdGgpOwogICAgICAgICAgICAgZ3JhcGhpY3ND b250ZXh0LT5zZXRTdHJva2VTdHlsZShzdHlsZSA9PSBEQVNIRUQgPyBEYXNoZWRTdHJva2UgOiBE b3R0ZWRTdHJva2UpOwogCiAgICAgICAgICAgICBpZiAod2lkdGggPiAwKQotICAgICAgICAgICAg ICAgIHN3aXRjaCAocykgeworICAgICAgICAgICAgICAgIHN3aXRjaCAoc2lkZSkgewogICAgICAg ICAgICAgICAgICAgICBjYXNlIEJTQm90dG9tOgogICAgICAgICAgICAgICAgICAgICBjYXNlIEJT VG9wOgogICAgICAgICAgICAgICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5kcmF3TGluZShJ bnRQb2ludCh4MSwgKHkxICsgeTIpIC8gMiksIEludFBvaW50KHgyLCAoeTEgKyB5MikgLyAyKSk7 CkBAIC03MzcsMTAgKzczNywxMCBAQCB2b2lkIFJlbmRlck9iamVjdDo6ZHJhd0xpbmVGb3JCb3hT aWRlKEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0LCBpbnQgeDEsCiAgICAgICAgIGNh c2UgRE9VQkxFOiB7CiAgICAgICAgICAgICBpbnQgdGhpcmQgPSAod2lkdGggKyAxKSAvIDM7CiAK LSAgICAgICAgICAgIGlmIChhZGpidzEgPT0gMCAmJiBhZGpidzIgPT0gMCkgeworICAgICAgICAg ICAgaWYgKGFkamFjZW50V2lkdGgxID09IDAgJiYgYWRqYWNlbnRXaWR0aDIgPT0gMCkgewogICAg ICAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+c2V0U3Ryb2tlU3R5bGUoTm9TdHJva2UpOwot ICAgICAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+c2V0RmlsbENvbG9yKGMsIG1fc3R5bGUt PmNvbG9yU3BhY2UoKSk7Ci0gICAgICAgICAgICAgICAgc3dpdGNoIChzKSB7CisgICAgICAgICAg ICAgICAgZ3JhcGhpY3NDb250ZXh0LT5zZXRGaWxsQ29sb3IoY29sb3IsIG1fc3R5bGUtPmNvbG9y U3BhY2UoKSk7CisgICAgICAgICAgICAgICAgc3dpdGNoIChzaWRlKSB7CiAgICAgICAgICAgICAg ICAgICAgIGNhc2UgQlNUb3A6CiAgICAgICAgICAgICAgICAgICAgIGNhc2UgQlNCb3R0b206CiAg ICAgICAgICAgICAgICAgICAgICAgICBncmFwaGljc0NvbnRleHQtPmRyYXdSZWN0KEludFJlY3Qo eDEsIHkxLCB4MiAtIHgxLCB0aGlyZCkpOwpAQCAtNzU2LDQxICs3NTYsNDEgQEAgdm9pZCBSZW5k ZXJPYmplY3Q6OmRyYXdMaW5lRm9yQm94U2lkZShHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29u dGV4dCwgaW50IHgxLAogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAg ICAgICAgfQogICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICBpbnQgYWRqYncx YmlndGhpcmQgPSAoKGFkamJ3MSA+IDApID8gYWRqYncxICsgMSA6IGFkamJ3MSAtIDEpIC8gMzsK LSAgICAgICAgICAgICAgICBpbnQgYWRqYncyYmlndGhpcmQgPSAoKGFkamJ3MiA+IDApID8gYWRq YncyICsgMSA6IGFkamJ3MiAtIDEpIC8gMzsKKyAgICAgICAgICAgICAgICBpbnQgYWRqYWNlbnQx QmlnVGhpcmQgPSAoKGFkamFjZW50V2lkdGgxID4gMCkgPyBhZGphY2VudFdpZHRoMSArIDEgOiBh ZGphY2VudFdpZHRoMSAtIDEpIC8gMzsKKyAgICAgICAgICAgICAgICBpbnQgYWRqYWNlbnQyQmln VGhpcmQgPSAoKGFkamFjZW50V2lkdGgyID4gMCkgPyBhZGphY2VudFdpZHRoMiArIDEgOiBhZGph Y2VudFdpZHRoMiAtIDEpIC8gMzsKIAotICAgICAgICAgICAgICAgIHN3aXRjaCAocykgeworICAg ICAgICAgICAgICAgIHN3aXRjaCAoc2lkZSkgewogICAgICAgICAgICAgICAgICAgICBjYXNlIEJT VG9wOgotICAgICAgICAgICAgICAgICAgICAgICAgZHJhd0xpbmVGb3JCb3hTaWRlKGdyYXBoaWNz Q29udGV4dCwgeDEgKyBtYXgoKC1hZGpidzEgKiAyICsgMSkgLyAzLCAwKSwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgeTEsIHgyIC0gbWF4KCgtYWRqYncyICogMiArIDEpIC8g MywgMCksIHkxICsgdGhpcmQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHMs IGMsIFNPTElELCBhZGpidzFiaWd0aGlyZCwgYWRqYncyYmlndGhpcmQpOwotICAgICAgICAgICAg ICAgICAgICAgICAgZHJhd0xpbmVGb3JCb3hTaWRlKGdyYXBoaWNzQ29udGV4dCwgeDEgKyBtYXgo KGFkamJ3MSAqIDIgKyAxKSAvIDMsIDApLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB5MiAtIHRoaXJkLCB4MiAtIG1heCgoYWRqYncyICogMiArIDEpIC8gMywgMCksIHkyLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzLCBjLCBTT0xJRCwgYWRqYncxYmln dGhpcmQsIGFkamJ3MmJpZ3RoaXJkKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGRyYXdMaW5l Rm9yQm94U2lkZShncmFwaGljc0NvbnRleHQsIHgxICsgbWF4KCgtYWRqYWNlbnRXaWR0aDEgKiAy ICsgMSkgLyAzLCAwKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgeTEsIHgy IC0gbWF4KCgtYWRqYWNlbnRXaWR0aDIgKiAyICsgMSkgLyAzLCAwKSwgeTEgKyB0aGlyZCwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2lkZSwgY29sb3IsIFNPTElELCBhZGph Y2VudDFCaWdUaGlyZCwgYWRqYWNlbnQyQmlnVGhpcmQpOworICAgICAgICAgICAgICAgICAgICAg ICAgZHJhd0xpbmVGb3JCb3hTaWRlKGdyYXBoaWNzQ29udGV4dCwgeDEgKyBtYXgoKGFkamFjZW50 V2lkdGgxICogMiArIDEpIC8gMywgMCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHkyIC0gdGhpcmQsIHgyIC0gbWF4KChhZGphY2VudFdpZHRoMiAqIDIgKyAxKSAvIDMsIDAp LCB5MiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2lkZSwgY29sb3IsIFNP TElELCBhZGphY2VudDFCaWdUaGlyZCwgYWRqYWNlbnQyQmlnVGhpcmQpOwogICAgICAgICAgICAg ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgICAgIGNhc2UgQlNMZWZ0OgotICAg ICAgICAgICAgICAgICAgICAgICAgZHJhd0xpbmVGb3JCb3hTaWRlKGdyYXBoaWNzQ29udGV4dCwg eDEsIHkxICsgbWF4KCgtYWRqYncxICogMiArIDEpIC8gMywgMCksCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHgxICsgdGhpcmQsIHkyIC0gbWF4KCgtYWRqYncyICogMiArIDEp IC8gMywgMCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHMsIGMsIFNPTElE LCBhZGpidzFiaWd0aGlyZCwgYWRqYncyYmlndGhpcmQpOwotICAgICAgICAgICAgICAgICAgICAg ICAgZHJhd0xpbmVGb3JCb3hTaWRlKGdyYXBoaWNzQ29udGV4dCwgeDIgLSB0aGlyZCwgeTEgKyBt YXgoKGFkamJ3MSAqIDIgKyAxKSAvIDMsIDApLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB4MiwgeTIgLSBtYXgoKGFkamJ3MiAqIDIgKyAxKSAvIDMsIDApLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBzLCBjLCBTT0xJRCwgYWRqYncxYmlndGhpcmQsIGFk amJ3MmJpZ3RoaXJkKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGRyYXdMaW5lRm9yQm94U2lk ZShncmFwaGljc0NvbnRleHQsIHgxLCB5MSArIG1heCgoLWFkamFjZW50V2lkdGgxICogMiArIDEp IC8gMywgMCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHgxICsgdGhpcmQs IHkyIC0gbWF4KCgtYWRqYWNlbnRXaWR0aDIgKiAyICsgMSkgLyAzLCAwKSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc2lkZSwgY29sb3IsIFNPTElELCBhZGphY2VudDFCaWdU aGlyZCwgYWRqYWNlbnQyQmlnVGhpcmQpOworICAgICAgICAgICAgICAgICAgICAgICAgZHJhd0xp bmVGb3JCb3hTaWRlKGdyYXBoaWNzQ29udGV4dCwgeDIgLSB0aGlyZCwgeTEgKyBtYXgoKGFkamFj ZW50V2lkdGgxICogMiArIDEpIC8gMywgMCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHgyLCB5MiAtIG1heCgoYWRqYWNlbnRXaWR0aDIgKiAyICsgMSkgLyAzLCAwKSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2lkZSwgY29sb3IsIFNPTElELCBhZGph Y2VudDFCaWdUaGlyZCwgYWRqYWNlbnQyQmlnVGhpcmQpOwogICAgICAgICAgICAgICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgICAgIGNhc2UgQlNCb3R0b206Ci0gICAgICAgICAg ICAgICAgICAgICAgICBkcmF3TGluZUZvckJveFNpZGUoZ3JhcGhpY3NDb250ZXh0LCB4MSArIG1h eCgoYWRqYncxICogMiArIDEpIC8gMywgMCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHkxLCB4MiAtIG1heCgoYWRqYncyICogMiArIDEpIC8gMywgMCksIHkxICsgdGhpcmQs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHMsIGMsIFNPTElELCBhZGpidzFi aWd0aGlyZCwgYWRqYncyYmlndGhpcmQpOwotICAgICAgICAgICAgICAgICAgICAgICAgZHJhd0xp bmVGb3JCb3hTaWRlKGdyYXBoaWNzQ29udGV4dCwgeDEgKyBtYXgoKC1hZGpidzEgKiAyICsgMSkg LyAzLCAwKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgeTIgLSB0aGlyZCwg eDIgLSBtYXgoKC1hZGpidzIgKiAyICsgMSkgLyAzLCAwKSwgeTIsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHMsIGMsIFNPTElELCBhZGpidzFiaWd0aGlyZCwgYWRqYncyYmln dGhpcmQpOworICAgICAgICAgICAgICAgICAgICAgICAgZHJhd0xpbmVGb3JCb3hTaWRlKGdyYXBo aWNzQ29udGV4dCwgeDEgKyBtYXgoKGFkamFjZW50V2lkdGgxICogMiArIDEpIC8gMywgMCksCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHkxLCB4MiAtIG1heCgoYWRqYWNlbnRX aWR0aDIgKiAyICsgMSkgLyAzLCAwKSwgeTEgKyB0aGlyZCwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgc2lkZSwgY29sb3IsIFNPTElELCBhZGphY2VudDFCaWdUaGlyZCwgYWRq YWNlbnQyQmlnVGhpcmQpOworICAgICAgICAgICAgICAgICAgICAgICAgZHJhd0xpbmVGb3JCb3hT aWRlKGdyYXBoaWNzQ29udGV4dCwgeDEgKyBtYXgoKC1hZGphY2VudFdpZHRoMSAqIDIgKyAxKSAv IDMsIDApLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB5MiAtIHRoaXJkLCB4 MiAtIG1heCgoLWFkamFjZW50V2lkdGgyICogMiArIDEpIC8gMywgMCksIHkyLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBzaWRlLCBjb2xvciwgU09MSUQsIGFkamFjZW50MUJp Z1RoaXJkLCBhZGphY2VudDJCaWdUaGlyZCk7CiAgICAgICAgICAgICAgICAgICAgICAgICBicmVh azsKICAgICAgICAgICAgICAgICAgICAgY2FzZSBCU1JpZ2h0OgotICAgICAgICAgICAgICAgICAg ICAgICAgZHJhd0xpbmVGb3JCb3hTaWRlKGdyYXBoaWNzQ29udGV4dCwgeDEsIHkxICsgbWF4KChh ZGpidzEgKiAyICsgMSkgLyAzLCAwKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgeDEgKyB0aGlyZCwgeTIgLSBtYXgoKGFkamJ3MiAqIDIgKyAxKSAvIDMsIDApLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzLCBjLCBTT0xJRCwgYWRqYncxYmlndGhpcmQs IGFkamJ3MmJpZ3RoaXJkKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGRyYXdMaW5lRm9yQm94 U2lkZShncmFwaGljc0NvbnRleHQsIHgyIC0gdGhpcmQsIHkxICsgbWF4KCgtYWRqYncxICogMiAr IDEpIC8gMywgMCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHgyLCB5MiAt IG1heCgoLWFkamJ3MiAqIDIgKyAxKSAvIDMsIDApLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBzLCBjLCBTT0xJRCwgYWRqYncxYmlndGhpcmQsIGFkamJ3MmJpZ3RoaXJkKTsK KyAgICAgICAgICAgICAgICAgICAgICAgIGRyYXdMaW5lRm9yQm94U2lkZShncmFwaGljc0NvbnRl eHQsIHgxLCB5MSArIG1heCgoYWRqYWNlbnRXaWR0aDEgKiAyICsgMSkgLyAzLCAwKSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgeDEgKyB0aGlyZCwgeTIgLSBtYXgoKGFkamFj ZW50V2lkdGgyICogMiArIDEpIC8gMywgMCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHNpZGUsIGNvbG9yLCBTT0xJRCwgYWRqYWNlbnQxQmlnVGhpcmQsIGFkamFjZW50MkJp Z1RoaXJkKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGRyYXdMaW5lRm9yQm94U2lkZShncmFw aGljc0NvbnRleHQsIHgyIC0gdGhpcmQsIHkxICsgbWF4KCgtYWRqYWNlbnRXaWR0aDEgKiAyICsg MSkgLyAzLCAwKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgeDIsIHkyIC0g bWF4KCgtYWRqYWNlbnRXaWR0aDIgKiAyICsgMSkgLyAzLCAwKSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc2lkZSwgY29sb3IsIFNPTElELCBhZGphY2VudDFCaWdUaGlyZCwg YWRqYWNlbnQyQmlnVGhpcmQpOwogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgICAgICAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsK QEAgLTc5OSw4ICs3OTksNyBAQCB2b2lkIFJlbmRlck9iamVjdDo6ZHJhd0xpbmVGb3JCb3hTaWRl KEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0LCBpbnQgeDEsCiAgICAgICAgICAgICBi cmVhazsKICAgICAgICAgfQogICAgICAgICBjYXNlIFJJREdFOgotICAgICAgICBjYXNlIEdST09W RToKLSAgICAgICAgeworICAgICAgICBjYXNlIEdST09WRTogewogICAgICAgICAgICAgRUJvcmRl clN0eWxlIHMxOwogICAgICAgICAgICAgRUJvcmRlclN0eWxlIHMyOwogICAgICAgICAgICAgaWYg KHN0eWxlID09IEdST09WRSkgewpAQCAtODExLDc5ICs4MTAsNzkgQEAgdm9pZCBSZW5kZXJPYmpl Y3Q6OmRyYXdMaW5lRm9yQm94U2lkZShHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4dCwg aW50IHgxLAogICAgICAgICAgICAgICAgIHMyID0gSU5TRVQ7CiAgICAgICAgICAgICB9CiAKLSAg ICAgICAgICAgIGludCBhZGpidzFiaWdoYWxmID0gKChhZGpidzEgPiAwKSA/IGFkamJ3MSArIDEg OiBhZGpidzEgLSAxKSAvIDI7Ci0gICAgICAgICAgICBpbnQgYWRqYncyYmlnaGFsZiA9ICgoYWRq YncyID4gMCkgPyBhZGpidzIgKyAxIDogYWRqYncyIC0gMSkgLyAyOworICAgICAgICAgICAgaW50 IGFkamFjZW50MUJpZ0hhbGYgPSAoKGFkamFjZW50V2lkdGgxID4gMCkgPyBhZGphY2VudFdpZHRo MSArIDEgOiBhZGphY2VudFdpZHRoMSAtIDEpIC8gMjsKKyAgICAgICAgICAgIGludCBhZGphY2Vu dDJCaWdIYWxmID0gKChhZGphY2VudFdpZHRoMiA+IDApID8gYWRqYWNlbnRXaWR0aDIgKyAxIDog YWRqYWNlbnRXaWR0aDIgLSAxKSAvIDI7CiAKLSAgICAgICAgICAgIHN3aXRjaCAocykgeworICAg ICAgICAgICAgc3dpdGNoIChzaWRlKSB7CiAgICAgICAgICAgICAgICAgY2FzZSBCU1RvcDoKLSAg ICAgICAgICAgICAgICAgICAgZHJhd0xpbmVGb3JCb3hTaWRlKGdyYXBoaWNzQ29udGV4dCwgeDEg KyBtYXgoLWFkamJ3MSwgMCkgLyAyLCB5MSwgeDIgLSBtYXgoLWFkamJ3MiwgMCkgLyAyLCAoeTEg KyB5MiArIDEpIC8gMiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzLCBjLCBzMSwg YWRqYncxYmlnaGFsZiwgYWRqYncyYmlnaGFsZik7Ci0gICAgICAgICAgICAgICAgICAgIGRyYXdM aW5lRm9yQm94U2lkZShncmFwaGljc0NvbnRleHQsIHgxICsgbWF4KGFkamJ3MSArIDEsIDApIC8g MiwgKHkxICsgeTIgKyAxKSAvIDIsIHgyIC0gbWF4KGFkamJ3MiArIDEsIDApIC8gMiwgeTIsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcywgYywgczIsIGFkamJ3MSAvIDIsIGFkamJ3 MiAvIDIpOworICAgICAgICAgICAgICAgICAgICBkcmF3TGluZUZvckJveFNpZGUoZ3JhcGhpY3ND b250ZXh0LCB4MSArIG1heCgtYWRqYWNlbnRXaWR0aDEsIDApIC8gMiwgeTEsIHgyIC0gbWF4KC1h ZGphY2VudFdpZHRoMiwgMCkgLyAyLCAoeTEgKyB5MiArIDEpIC8gMiwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzaWRlLCBjb2xvciwgczEsIGFkamFjZW50MUJpZ0hhbGYsIGFkamFj ZW50MkJpZ0hhbGYpOworICAgICAgICAgICAgICAgICAgICBkcmF3TGluZUZvckJveFNpZGUoZ3Jh cGhpY3NDb250ZXh0LCB4MSArIG1heChhZGphY2VudFdpZHRoMSArIDEsIDApIC8gMiwgKHkxICsg eTIgKyAxKSAvIDIsIHgyIC0gbWF4KGFkamFjZW50V2lkdGgyICsgMSwgMCkgLyAyLCB5MiwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzaWRlLCBjb2xvciwgczIsIGFkamFjZW50V2lk dGgxIC8gMiwgYWRqYWNlbnRXaWR0aDIgLyAyKTsKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgICAgICAgICAgY2FzZSBCU0xlZnQ6Ci0gICAgICAgICAgICAgICAgICAgIGRyYXdM aW5lRm9yQm94U2lkZShncmFwaGljc0NvbnRleHQsIHgxLCB5MSArIG1heCgtYWRqYncxLCAwKSAv IDIsICh4MSArIHgyICsgMSkgLyAyLCB5MiAtIG1heCgtYWRqYncyLCAwKSAvIDIsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcywgYywgczEsIGFkamJ3MWJpZ2hhbGYsIGFkamJ3MmJp Z2hhbGYpOwotICAgICAgICAgICAgICAgICAgICBkcmF3TGluZUZvckJveFNpZGUoZ3JhcGhpY3ND b250ZXh0LCAoeDEgKyB4MiArIDEpIC8gMiwgeTEgKyBtYXgoYWRqYncxICsgMSwgMCkgLyAyLCB4 MiwgeTIgLSBtYXgoYWRqYncyICsgMSwgMCkgLyAyLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHMsIGMsIHMyLCBhZGpidzEgLyAyLCBhZGpidzIgLyAyKTsKKyAgICAgICAgICAgICAg ICAgICAgZHJhd0xpbmVGb3JCb3hTaWRlKGdyYXBoaWNzQ29udGV4dCwgeDEsIHkxICsgbWF4KC1h ZGphY2VudFdpZHRoMSwgMCkgLyAyLCAoeDEgKyB4MiArIDEpIC8gMiwgeTIgLSBtYXgoLWFkamFj ZW50V2lkdGgyLCAwKSAvIDIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2lkZSwg Y29sb3IsIHMxLCBhZGphY2VudDFCaWdIYWxmLCBhZGphY2VudDJCaWdIYWxmKTsKKyAgICAgICAg ICAgICAgICAgICAgZHJhd0xpbmVGb3JCb3hTaWRlKGdyYXBoaWNzQ29udGV4dCwgKHgxICsgeDIg KyAxKSAvIDIsIHkxICsgbWF4KGFkamFjZW50V2lkdGgxICsgMSwgMCkgLyAyLCB4MiwgeTIgLSBt YXgoYWRqYWNlbnRXaWR0aDIgKyAxLCAwKSAvIDIsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc2lkZSwgY29sb3IsIHMyLCBhZGphY2VudFdpZHRoMSAvIDIsIGFkamFjZW50V2lkdGgy IC8gMik7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIGNhc2Ug QlNCb3R0b206Ci0gICAgICAgICAgICAgICAgICAgIGRyYXdMaW5lRm9yQm94U2lkZShncmFwaGlj c0NvbnRleHQsIHgxICsgbWF4KGFkamJ3MSwgMCkgLyAyLCB5MSwgeDIgLSBtYXgoYWRqYncyLCAw KSAvIDIsICh5MSArIHkyICsgMSkgLyAyLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHMsIGMsIHMyLCBhZGpidzFiaWdoYWxmLCBhZGpidzJiaWdoYWxmKTsKLSAgICAgICAgICAgICAg ICAgICAgZHJhd0xpbmVGb3JCb3hTaWRlKGdyYXBoaWNzQ29udGV4dCwgeDEgKyBtYXgoLWFkamJ3 MSArIDEsIDApIC8gMiwgKHkxICsgeTIgKyAxKSAvIDIsIHgyIC0gbWF4KC1hZGpidzIgKyAxLCAw KSAvIDIsIHkyLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHMsIGMsIHMxLCBhZGpi dzEgLyAyLCBhZGpidzIgLyAyKTsKKyAgICAgICAgICAgICAgICAgICAgZHJhd0xpbmVGb3JCb3hT aWRlKGdyYXBoaWNzQ29udGV4dCwgeDEgKyBtYXgoYWRqYWNlbnRXaWR0aDEsIDApIC8gMiwgeTEs IHgyIC0gbWF4KGFkamFjZW50V2lkdGgyLCAwKSAvIDIsICh5MSArIHkyICsgMSkgLyAyLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNpZGUsIGNvbG9yLCBzMiwgYWRqYWNlbnQxQmln SGFsZiwgYWRqYWNlbnQyQmlnSGFsZik7CisgICAgICAgICAgICAgICAgICAgIGRyYXdMaW5lRm9y Qm94U2lkZShncmFwaGljc0NvbnRleHQsIHgxICsgbWF4KC1hZGphY2VudFdpZHRoMSArIDEsIDAp IC8gMiwgKHkxICsgeTIgKyAxKSAvIDIsIHgyIC0gbWF4KC1hZGphY2VudFdpZHRoMiArIDEsIDAp IC8gMiwgeTIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2lkZSwgY29sb3IsIHMx LCBhZGphY2VudFdpZHRoMSAvIDIsIGFkamFjZW50V2lkdGgyIC8gMik7CiAgICAgICAgICAgICAg ICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIGNhc2UgQlNSaWdodDoKLSAgICAgICAgICAg ICAgICAgICAgZHJhd0xpbmVGb3JCb3hTaWRlKGdyYXBoaWNzQ29udGV4dCwgeDEsIHkxICsgbWF4 KGFkamJ3MSwgMCkgLyAyLCAoeDEgKyB4MiArIDEpIC8gMiwgeTIgLSBtYXgoYWRqYncyLCAwKSAv IDIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcywgYywgczIsIGFkamJ3MWJpZ2hh bGYsIGFkamJ3MmJpZ2hhbGYpOwotICAgICAgICAgICAgICAgICAgICBkcmF3TGluZUZvckJveFNp ZGUoZ3JhcGhpY3NDb250ZXh0LCAoeDEgKyB4MiArIDEpIC8gMiwgeTEgKyBtYXgoLWFkamJ3MSAr IDEsIDApIC8gMiwgeDIsIHkyIC0gbWF4KC1hZGpidzIgKyAxLCAwKSAvIDIsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcywgYywgczEsIGFkamJ3MSAvIDIsIGFkamJ3MiAvIDIpOwor ICAgICAgICAgICAgICAgICAgICBkcmF3TGluZUZvckJveFNpZGUoZ3JhcGhpY3NDb250ZXh0LCB4 MSwgeTEgKyBtYXgoYWRqYWNlbnRXaWR0aDEsIDApIC8gMiwgKHgxICsgeDIgKyAxKSAvIDIsIHky IC0gbWF4KGFkamFjZW50V2lkdGgyLCAwKSAvIDIsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc2lkZSwgY29sb3IsIHMyLCBhZGphY2VudDFCaWdIYWxmLCBhZGphY2VudDJCaWdIYWxm KTsKKyAgICAgICAgICAgICAgICAgICAgZHJhd0xpbmVGb3JCb3hTaWRlKGdyYXBoaWNzQ29udGV4 dCwgKHgxICsgeDIgKyAxKSAvIDIsIHkxICsgbWF4KC1hZGphY2VudFdpZHRoMSArIDEsIDApIC8g MiwgeDIsIHkyIC0gbWF4KC1hZGphY2VudFdpZHRoMiArIDEsIDApIC8gMiwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBzaWRlLCBjb2xvciwgczEsIGFkamFjZW50V2lkdGgxIC8gMiwg YWRqYWNlbnRXaWR0aDIgLyAyKTsKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg ICAgICB9CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBjYXNlIElOU0VU OgotICAgICAgICAgICAgaWYgKHMgPT0gQlNUb3AgfHwgcyA9PSBCU0xlZnQpCi0gICAgICAgICAg ICAgICAgYyA9IGMuZGFyaygpOworICAgICAgICAgICAgaWYgKHNpZGUgPT0gQlNUb3AgfHwgc2lk ZSA9PSBCU0xlZnQpCisgICAgICAgICAgICAgICAgY29sb3IgPSBjb2xvci5kYXJrKCk7CiAgICAg ICAgICAgICAvLyBmYWxsIHRocm91Z2gKICAgICAgICAgY2FzZSBPVVRTRVQ6Ci0gICAgICAgICAg ICBpZiAoc3R5bGUgPT0gT1VUU0VUICYmIChzID09IEJTQm90dG9tIHx8IHMgPT0gQlNSaWdodCkp Ci0gICAgICAgICAgICAgICAgYyA9IGMuZGFyaygpOworICAgICAgICAgICAgaWYgKHN0eWxlID09 IE9VVFNFVCAmJiAoc2lkZSA9PSBCU0JvdHRvbSB8fCBzaWRlID09IEJTUmlnaHQpKQorICAgICAg ICAgICAgICAgIGNvbG9yID0gY29sb3IuZGFyaygpOwogICAgICAgICAgICAgLy8gZmFsbCB0aHJv dWdoCiAgICAgICAgIGNhc2UgU09MSUQ6IHsKICAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+ c2V0U3Ryb2tlU3R5bGUoTm9TdHJva2UpOwotICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5z ZXRGaWxsQ29sb3IoYywgbV9zdHlsZS0+Y29sb3JTcGFjZSgpKTsKKyAgICAgICAgICAgIGdyYXBo aWNzQ29udGV4dC0+c2V0RmlsbENvbG9yKGNvbG9yLCBtX3N0eWxlLT5jb2xvclNwYWNlKCkpOwog ICAgICAgICAgICAgQVNTRVJUKHgyID49IHgxKTsKICAgICAgICAgICAgIEFTU0VSVCh5MiA+PSB5 MSk7Ci0gICAgICAgICAgICBpZiAoIWFkamJ3MSAmJiAhYWRqYncyKSB7CisgICAgICAgICAgICBp ZiAoIWFkamFjZW50V2lkdGgxICYmICFhZGphY2VudFdpZHRoMikgewogICAgICAgICAgICAgICAg IGdyYXBoaWNzQ29udGV4dC0+ZHJhd1JlY3QoSW50UmVjdCh4MSwgeTEsIHgyIC0geDEsIHkyIC0g eTEpKTsKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICBGbG9hdFBvaW50IHF1YWRbNF07Ci0gICAgICAgICAgICBzd2l0Y2ggKHMpIHsKKyAgICAgICAg ICAgIHN3aXRjaCAoc2lkZSkgewogICAgICAgICAgICAgICAgIGNhc2UgQlNUb3A6Ci0gICAgICAg ICAgICAgICAgICAgIHF1YWRbMF0gPSBGbG9hdFBvaW50KHgxICsgbWF4KC1hZGpidzEsIDApLCB5 MSk7Ci0gICAgICAgICAgICAgICAgICAgIHF1YWRbMV0gPSBGbG9hdFBvaW50KHgxICsgbWF4KGFk amJ3MSwgMCksIHkyKTsKLSAgICAgICAgICAgICAgICAgICAgcXVhZFsyXSA9IEZsb2F0UG9pbnQo eDIgLSBtYXgoYWRqYncyLCAwKSwgeTIpOwotICAgICAgICAgICAgICAgICAgICBxdWFkWzNdID0g RmxvYXRQb2ludCh4MiAtIG1heCgtYWRqYncyLCAwKSwgeTEpOworICAgICAgICAgICAgICAgICAg ICBxdWFkWzBdID0gRmxvYXRQb2ludCh4MSArIG1heCgtYWRqYWNlbnRXaWR0aDEsIDApLCB5MSk7 CisgICAgICAgICAgICAgICAgICAgIHF1YWRbMV0gPSBGbG9hdFBvaW50KHgxICsgbWF4KGFkamFj ZW50V2lkdGgxLCAwKSwgeTIpOworICAgICAgICAgICAgICAgICAgICBxdWFkWzJdID0gRmxvYXRQ b2ludCh4MiAtIG1heChhZGphY2VudFdpZHRoMiwgMCksIHkyKTsKKyAgICAgICAgICAgICAgICAg ICAgcXVhZFszXSA9IEZsb2F0UG9pbnQoeDIgLSBtYXgoLWFkamFjZW50V2lkdGgyLCAwKSwgeTEp OwogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICBjYXNlIEJTQm90 dG9tOgotICAgICAgICAgICAgICAgICAgICBxdWFkWzBdID0gRmxvYXRQb2ludCh4MSArIG1heChh ZGpidzEsIDApLCB5MSk7Ci0gICAgICAgICAgICAgICAgICAgIHF1YWRbMV0gPSBGbG9hdFBvaW50 KHgxICsgbWF4KC1hZGpidzEsIDApLCB5Mik7Ci0gICAgICAgICAgICAgICAgICAgIHF1YWRbMl0g PSBGbG9hdFBvaW50KHgyIC0gbWF4KC1hZGpidzIsIDApLCB5Mik7Ci0gICAgICAgICAgICAgICAg ICAgIHF1YWRbM10gPSBGbG9hdFBvaW50KHgyIC0gbWF4KGFkamJ3MiwgMCksIHkxKTsKKyAgICAg ICAgICAgICAgICAgICAgcXVhZFswXSA9IEZsb2F0UG9pbnQoeDEgKyBtYXgoYWRqYWNlbnRXaWR0 aDEsIDApLCB5MSk7CisgICAgICAgICAgICAgICAgICAgIHF1YWRbMV0gPSBGbG9hdFBvaW50KHgx ICsgbWF4KC1hZGphY2VudFdpZHRoMSwgMCksIHkyKTsKKyAgICAgICAgICAgICAgICAgICAgcXVh ZFsyXSA9IEZsb2F0UG9pbnQoeDIgLSBtYXgoLWFkamFjZW50V2lkdGgyLCAwKSwgeTIpOworICAg ICAgICAgICAgICAgICAgICBxdWFkWzNdID0gRmxvYXRQb2ludCh4MiAtIG1heChhZGphY2VudFdp ZHRoMiwgMCksIHkxKTsKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAg ICAgY2FzZSBCU0xlZnQ6Ci0gICAgICAgICAgICAgICAgICAgIHF1YWRbMF0gPSBGbG9hdFBvaW50 KHgxLCB5MSArIG1heCgtYWRqYncxLCAwKSk7Ci0gICAgICAgICAgICAgICAgICAgIHF1YWRbMV0g PSBGbG9hdFBvaW50KHgxLCB5MiAtIG1heCgtYWRqYncyLCAwKSk7Ci0gICAgICAgICAgICAgICAg ICAgIHF1YWRbMl0gPSBGbG9hdFBvaW50KHgyLCB5MiAtIG1heChhZGpidzIsIDApKTsKLSAgICAg ICAgICAgICAgICAgICAgcXVhZFszXSA9IEZsb2F0UG9pbnQoeDIsIHkxICsgbWF4KGFkamJ3MSwg MCkpOworICAgICAgICAgICAgICAgICAgICBxdWFkWzBdID0gRmxvYXRQb2ludCh4MSwgeTEgKyBt YXgoLWFkamFjZW50V2lkdGgxLCAwKSk7CisgICAgICAgICAgICAgICAgICAgIHF1YWRbMV0gPSBG bG9hdFBvaW50KHgxLCB5MiAtIG1heCgtYWRqYWNlbnRXaWR0aDIsIDApKTsKKyAgICAgICAgICAg ICAgICAgICAgcXVhZFsyXSA9IEZsb2F0UG9pbnQoeDIsIHkyIC0gbWF4KGFkamFjZW50V2lkdGgy LCAwKSk7CisgICAgICAgICAgICAgICAgICAgIHF1YWRbM10gPSBGbG9hdFBvaW50KHgyLCB5MSAr IG1heChhZGphY2VudFdpZHRoMSwgMCkpOwogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgICAgICAgICBjYXNlIEJTUmlnaHQ6Ci0gICAgICAgICAgICAgICAgICAgIHF1YWRbMF0g PSBGbG9hdFBvaW50KHgxLCB5MSArIG1heChhZGpidzEsIDApKTsKLSAgICAgICAgICAgICAgICAg ICAgcXVhZFsxXSA9IEZsb2F0UG9pbnQoeDEsIHkyIC0gbWF4KGFkamJ3MiwgMCkpOwotICAgICAg ICAgICAgICAgICAgICBxdWFkWzJdID0gRmxvYXRQb2ludCh4MiwgeTIgLSBtYXgoLWFkamJ3Miwg MCkpOwotICAgICAgICAgICAgICAgICAgICBxdWFkWzNdID0gRmxvYXRQb2ludCh4MiwgeTEgKyBt YXgoLWFkamJ3MSwgMCkpOworICAgICAgICAgICAgICAgICAgICBxdWFkWzBdID0gRmxvYXRQb2lu dCh4MSwgeTEgKyBtYXgoYWRqYWNlbnRXaWR0aDEsIDApKTsKKyAgICAgICAgICAgICAgICAgICAg cXVhZFsxXSA9IEZsb2F0UG9pbnQoeDEsIHkyIC0gbWF4KGFkamFjZW50V2lkdGgyLCAwKSk7Cisg ICAgICAgICAgICAgICAgICAgIHF1YWRbMl0gPSBGbG9hdFBvaW50KHgyLCB5MiAtIG1heCgtYWRq YWNlbnRXaWR0aDIsIDApKTsKKyAgICAgICAgICAgICAgICAgICAgcXVhZFszXSA9IEZsb2F0UG9p bnQoeDIsIHkxICsgbWF4KC1hZGphY2VudFdpZHRoMSwgMCkpOwogICAgICAgICAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+ZHJh d0NvbnZleFBvbHlnb24oNCwgcXVhZCk7CkBAIC05MDQsNyArOTAzLDcgQEAgSW50UmVjdCBSZW5k ZXJPYmplY3Q6OmJvcmRlcklubmVyUmVjdChjb25zdCBJbnRSZWN0JiBib3JkZXJSZWN0LCB1bnNp Z25lZCBzaG9ydAogI2lmIEhBVkUoUEFUSF9CQVNFRF9CT1JERVJfUkFESVVTX0RSQVdJTkcpCiB2 b2lkIFJlbmRlck9iamVjdDo6ZHJhd0JveFNpZGVGcm9tUGF0aChHcmFwaGljc0NvbnRleHQqIGdy YXBoaWNzQ29udGV4dCwgY29uc3QgSW50UmVjdCYgYm9yZGVyUmVjdCwgY29uc3QgUGF0aCYgYm9y ZGVyUGF0aCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsb2F0IHRoaWNr bmVzcywgZmxvYXQgZHJhd1RoaWNrbmVzcywgQm94U2lkZSBzLCBjb25zdCBSZW5kZXJTdHlsZSog c3R5bGUsIAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQ29sb3IgYywgRUJv cmRlclN0eWxlIGJvcmRlclN0eWxlKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgQ29sb3IgY29sb3IsIEVCb3JkZXJTdHlsZSBib3JkZXJTdHlsZSkKIHsKICAgICBpZiAodGhp Y2tuZXNzIDw9IDApCiAgICAgICAgIHJldHVybjsKQEAgLTkxOCw3ICs5MTcsNyBAQCB2b2lkIFJl bmRlck9iamVjdDo6ZHJhd0JveFNpZGVGcm9tUGF0aChHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNz Q29udGV4dCwgY29uc3QgSQogICAgICAgICByZXR1cm47CiAgICAgY2FzZSBET1RURUQ6CiAgICAg Y2FzZSBEQVNIRUQ6IHsKLSAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5zZXRTdHJva2VDb2xvcihj LCBzdHlsZS0+Y29sb3JTcGFjZSgpKTsKKyAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5zZXRTdHJv a2VDb2xvcihjb2xvciwgc3R5bGUtPmNvbG9yU3BhY2UoKSk7CiAKICAgICAgICAgLy8gVGhlIHN0 cm9rZSBpcyBkb3VibGVkIGhlcmUgYmVjYXVzZSB0aGUgcHJvdmlkZWQgcGF0aCBpcyB0aGUgCiAg ICAgICAgIC8vIG91dHNpZGUgZWRnZSBvZiB0aGUgYm9yZGVyIHNvIGhhbGYgdGhlIHN0cm9rZSBp cyBjbGlwcGVkIG9mZi4gCkBAIC05ODgsNyArOTg3LDcgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OmRy YXdCb3hTaWRlRnJvbVBhdGgoR3JhcGhpY3NDb250ZXh0KiBncmFwaGljc0NvbnRleHQsIGNvbnN0 IEkKICAgICAgICAgUm91bmRlZEludFJlY3QgaW5uZXJDbGlwID0gc3R5bGUtPmdldFJvdW5kZWRJ bm5lckJvcmRlcldpdGhCb3JkZXJXaWR0aHMoaW5uZXJCb3JkZXJJbm5lclJlY3QsIGlubmVyQm9y ZGVyVG9wV2lkdGgsIGlubmVyQm9yZGVyQm90dG9tV2lkdGgsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGlubmVyQm9yZGVyTGVmdFdpZHRoLCBpbm5lckJvcmRlclJpZ2h0V2lkdGgpOwogICAgICAg ICBncmFwaGljc0NvbnRleHQtPmFkZFJvdW5kZWRSZWN0Q2xpcChpbm5lckNsaXApOwotICAgICAg ICBkcmF3Qm94U2lkZUZyb21QYXRoKGdyYXBoaWNzQ29udGV4dCwgYm9yZGVyUmVjdCwgYm9yZGVy UGF0aCwgdGhpY2tuZXNzLCBkcmF3VGhpY2tuZXNzLCBzLCBzdHlsZSwgYywgU09MSUQpOworICAg ICAgICBkcmF3Qm94U2lkZUZyb21QYXRoKGdyYXBoaWNzQ29udGV4dCwgYm9yZGVyUmVjdCwgYm9y ZGVyUGF0aCwgdGhpY2tuZXNzLCBkcmF3VGhpY2tuZXNzLCBzLCBzdHlsZSwgY29sb3IsIFNPTElE KTsKICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5yZXN0b3JlKCk7CiAKICAgICAgICAgLy8gRHJh dyBvdXRlciBib3JkZXIgbGluZQpAQCAtOTk4LDcgKzk5Nyw3IEBAIHZvaWQgUmVuZGVyT2JqZWN0 OjpkcmF3Qm94U2lkZUZyb21QYXRoKEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0LCBj b25zdCBJCiAgICAgICAgIFJvdW5kZWRJbnRSZWN0IG91dGVyQ2xpcCA9IHN0eWxlLT5nZXRSb3Vu ZGVkSW5uZXJCb3JkZXJXaXRoQm9yZGVyV2lkdGhzKG91dGVyQm9yZGVySW5uZXJSZWN0LCBvdXRl ckJvcmRlclRvcFdpZHRoLCBvdXRlckJvcmRlckJvdHRvbVdpZHRoLCAKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgb3V0ZXJCb3JkZXJMZWZ0V2lkdGgsIG91dGVyQm9yZGVyUmlnaHRXaWR0aCk7CiAg ICAgICAgIGdyYXBoaWNzQ29udGV4dC0+Y2xpcE91dFJvdW5kZWRSZWN0KG91dGVyQ2xpcCk7Ci0g ICAgICAgIGRyYXdCb3hTaWRlRnJvbVBhdGgoZ3JhcGhpY3NDb250ZXh0LCBib3JkZXJSZWN0LCBi b3JkZXJQYXRoLCB0aGlja25lc3MsIGRyYXdUaGlja25lc3MsIHMsIHN0eWxlLCBjLCBTT0xJRCk7 CisgICAgICAgIGRyYXdCb3hTaWRlRnJvbVBhdGgoZ3JhcGhpY3NDb250ZXh0LCBib3JkZXJSZWN0 LCBib3JkZXJQYXRoLCB0aGlja25lc3MsIGRyYXdUaGlja25lc3MsIHMsIHN0eWxlLCBjb2xvciwg U09MSUQpOwogICAgICAgICBncmFwaGljc0NvbnRleHQtPnJlc3RvcmUoKTsKIAogICAgICAgICBy ZXR1cm47CkBAIC0xMDIwLDM3ICsxMDE5LDM3IEBAIHZvaWQgUmVuZGVyT2JqZWN0OjpkcmF3Qm94 U2lkZUZyb21QYXRoKEdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0LCBjb25zdCBJCiAg ICAgICAgICAgICBzdHlsZS0+Ym9yZGVyTGVmdFdpZHRoKCkgLyAyLCBzdHlsZS0+Ym9yZGVyUmln aHRXaWR0aCgpIC8gMik7CiAKICAgICAgICAgLy8gUGFpbnQgZnVsbCBib3JkZXIKLSAgICAgICAg ZHJhd0JveFNpZGVGcm9tUGF0aChncmFwaGljc0NvbnRleHQsIGJvcmRlclJlY3QsIGJvcmRlclBh dGgsIHRoaWNrbmVzcywgZHJhd1RoaWNrbmVzcywgcywgc3R5bGUsIGMsIHMxKTsKKyAgICAgICAg ZHJhd0JveFNpZGVGcm9tUGF0aChncmFwaGljc0NvbnRleHQsIGJvcmRlclJlY3QsIGJvcmRlclBh dGgsIHRoaWNrbmVzcywgZHJhd1RoaWNrbmVzcywgcywgc3R5bGUsIGNvbG9yLCBzMSk7CiAKICAg ICAgICAgLy8gUGFpbnQgaW5uZXIgb25seQogICAgICAgICBncmFwaGljc0NvbnRleHQtPnNhdmUo KTsKICAgICAgICAgUm91bmRlZEludFJlY3QgY2xpcFJlY3QgPSBzdHlsZS0+Z2V0Um91bmRlZElu bmVyQm9yZGVyV2l0aEJvcmRlcldpZHRocyhoYWxmQm9yZGVyUmVjdCwgc3R5bGUtPmJvcmRlckxl ZnRXaWR0aCgpIC8gMiwgc3R5bGUtPmJvcmRlckJvdHRvbVdpZHRoKCkgLyAyLCAKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBzdHlsZS0+Ym9yZGVyTGVmdFdpZHRoKCkgLyAyLCBzdHlsZS0+Ym9yZGVy UmlnaHRXaWR0aCgpIC8gMik7CiAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+YWRkUm91bmRlZFJl Y3RDbGlwKGNsaXBSZWN0KTsKLSAgICAgICAgZHJhd0JveFNpZGVGcm9tUGF0aChncmFwaGljc0Nv bnRleHQsIGJvcmRlclJlY3QsIGJvcmRlclBhdGgsIHRoaWNrbmVzcywgZHJhd1RoaWNrbmVzcywg cywgc3R5bGUsIGMsIHMyKTsKKyAgICAgICAgZHJhd0JveFNpZGVGcm9tUGF0aChncmFwaGljc0Nv bnRleHQsIGJvcmRlclJlY3QsIGJvcmRlclBhdGgsIHRoaWNrbmVzcywgZHJhd1RoaWNrbmVzcywg cywgc3R5bGUsIGNvbG9yLCBzMik7CiAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+cmVzdG9yZSgp OwogCiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgY2FzZSBJTlNFVDoKICAgICAgICAgaWYg KHMgPT0gQlNUb3AgfHwgcyA9PSBCU0xlZnQpCi0gICAgICAgICAgICBjID0gYy5kYXJrKCk7Cisg ICAgICAgICAgICBjb2xvciA9IGNvbG9yLmRhcmsoKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2Fz ZSBPVVRTRVQ6CiAgICAgICAgIGlmIChzID09IEJTQm90dG9tIHx8IHMgPT0gQlNSaWdodCkKLSAg ICAgICAgICAgIGMgPSBjLmRhcmsoKTsKKyAgICAgICAgICAgIGNvbG9yID0gY29sb3IuZGFyaygp OwogICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBicmVhazsKICAgICB9CiAK ICAgICBncmFwaGljc0NvbnRleHQtPnNldFN0cm9rZVN0eWxlKE5vU3Ryb2tlKTsKLSAgICBncmFw aGljc0NvbnRleHQtPnNldEZpbGxDb2xvcihjLCBzdHlsZS0+Y29sb3JTcGFjZSgpKTsKKyAgICBn cmFwaGljc0NvbnRleHQtPnNldEZpbGxDb2xvcihjb2xvciwgc3R5bGUtPmNvbG9yU3BhY2UoKSk7 CiAgICAgZ3JhcGhpY3NDb250ZXh0LT5kcmF3UmVjdChib3JkZXJSZWN0KTsKIH0KICNlbHNlCiB2 b2lkIFJlbmRlck9iamVjdDo6ZHJhd0FyY0ZvckJveFNpZGUoR3JhcGhpY3NDb250ZXh0KiBncmFw aGljc0NvbnRleHQsIGludCB4LCBpbnQgeSwgZmxvYXQgdGhpY2tuZXNzLCBjb25zdCBJbnRTaXpl JiByYWRpdXMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IGFuZ2xl U3RhcnQsIGludCBhbmdsZVNwYW4sIEJveFNpZGUgcywgQ29sb3IgYywKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBpbnQgYW5nbGVTdGFydCwgaW50IGFuZ2xlU3BhbiwgQm94 U2lkZSBzLCBDb2xvciBjb2xvciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBFQm9yZGVyU3R5bGUgc3R5bGUsIGJvb2wgZmlyc3RDb3JuZXIpCiB7CiAgICAgLy8gRklYTUU6 IFRoaXMgZnVuY3Rpb24gc2hvdWxkIGJlIHJlbW92ZWQgd2hlbiBhbGwgcG9ydHMgaW1wbGVtZW50 IEdyYXBoaWNzQ29udGV4dDo6Y2xpcENvbnZleFBvbHlnb24oKSEhCkBAIC0xMDY0LDcgKzEwNjMs NyBAQCB2b2lkIFJlbmRlck9iamVjdDo6ZHJhd0FyY0ZvckJveFNpZGUoR3JhcGhpY3NDb250ZXh0 KiBncmFwaGljc0NvbnRleHQsIGludCB4LCBpbgogICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICBjYXNlIERPVFRFRDoKICAgICAgICAgY2FzZSBEQVNIRUQ6Ci0gICAgICAgICAgICBncmFwaGlj c0NvbnRleHQtPnNldFN0cm9rZUNvbG9yKGMsIG1fc3R5bGUtPmNvbG9yU3BhY2UoKSk7CisgICAg ICAgICAgICBncmFwaGljc0NvbnRleHQtPnNldFN0cm9rZUNvbG9yKGNvbG9yLCBtX3N0eWxlLT5j b2xvclNwYWNlKCkpOwogICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5zZXRTdHJva2VTdHls ZShzdHlsZSA9PSBET1RURUQgPyBEb3R0ZWRTdHJva2UgOiBEYXNoZWRTdHJva2UpOwogICAgICAg ICAgICAgZ3JhcGhpY3NDb250ZXh0LT5zZXRTdHJva2VUaGlja25lc3ModGhpY2tuZXNzKTsKICAg ICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+c3Ryb2tlQXJjKEludFJlY3QoeCwgeSwgcmFkaXVz LndpZHRoKCkgKiAyLCByYWRpdXMuaGVpZ2h0KCkgKiAyKSwgYW5nbGVTdGFydCwgYW5nbGVTcGFu KTsKQEAgLTEwODYsNyArMTA4NSw3IEBAIHZvaWQgUmVuZGVyT2JqZWN0OjpkcmF3QXJjRm9yQm94 U2lkZShHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNzQ29udGV4dCwgaW50IHgsIGluCiAgICAgICAg ICAgICB9CiAKICAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+c2V0U3Ryb2tlU3R5bGUoU29s aWRTdHJva2UpOwotICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5zZXRTdHJva2VDb2xvcihj LCBtX3N0eWxlLT5jb2xvclNwYWNlKCkpOworICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5z ZXRTdHJva2VDb2xvcihjb2xvciwgbV9zdHlsZS0+Y29sb3JTcGFjZSgpKTsKICAgICAgICAgICAg IGdyYXBoaWNzQ29udGV4dC0+c2V0U3Ryb2tlVGhpY2tuZXNzKHRoaXJkKTsKICAgICAgICAgICAg IGdyYXBoaWNzQ29udGV4dC0+c3Ryb2tlQXJjKEludFJlY3QoeCwgb3V0ZXJZLCByYWRpdXMud2lk dGgoKSAqIDIsIG91dGVySGVpZ2h0KSwgYW5nbGVTdGFydCwgYW5nbGVTcGFuKTsKICAgICAgICAg ICAgIGdyYXBoaWNzQ29udGV4dC0+c2V0U3Ryb2tlVGhpY2tuZXNzKGlubmVyVGhpcmQgPiAyID8g aW5uZXJUaGlyZCAtIDEgOiBpbm5lclRoaXJkKTsKQEAgLTEwOTgsMTQgKzEwOTcsMTQgQEAgdm9p ZCBSZW5kZXJPYmplY3Q6OmRyYXdBcmNGb3JCb3hTaWRlKEdyYXBoaWNzQ29udGV4dCogZ3JhcGhp Y3NDb250ZXh0LCBpbnQgeCwgaW4KICAgICAgICAgICAgIENvbG9yIGMyOwogICAgICAgICAgICAg aWYgKChzdHlsZSA9PSBSSURHRSAmJiAocyA9PSBCU1RvcCB8fCBzID09IEJTTGVmdCkpIHx8CiAg ICAgICAgICAgICAgICAgICAgIChzdHlsZSA9PSBHUk9PVkUgJiYgKHMgPT0gQlNCb3R0b20gfHwg cyA9PSBCU1JpZ2h0KSkpCi0gICAgICAgICAgICAgICAgYzIgPSBjLmRhcmsoKTsKKyAgICAgICAg ICAgICAgICBjMiA9IGNvbG9yLmRhcmsoKTsKICAgICAgICAgICAgIGVsc2UgewotICAgICAgICAg ICAgICAgIGMyID0gYzsKLSAgICAgICAgICAgICAgICBjID0gYy5kYXJrKCk7CisgICAgICAgICAg ICAgICAgYzIgPSBjb2xvcjsKKyAgICAgICAgICAgICAgICBjb2xvciA9IGNvbG9yLmRhcmsoKTsK ICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5zZXRTdHJva2VT dHlsZShTb2xpZFN0cm9rZSk7Ci0gICAgICAgICAgICBncmFwaGljc0NvbnRleHQtPnNldFN0cm9r ZUNvbG9yKGMsIG1fc3R5bGUtPmNvbG9yU3BhY2UoKSk7CisgICAgICAgICAgICBncmFwaGljc0Nv bnRleHQtPnNldFN0cm9rZUNvbG9yKGNvbG9yLCBtX3N0eWxlLT5jb2xvclNwYWNlKCkpOwogICAg ICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5zZXRTdHJva2VUaGlja25lc3ModGhpY2tuZXNzKTsK ICAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+c3Ryb2tlQXJjKEludFJlY3QoeCwgeSwgcmFk aXVzLndpZHRoKCkgKiAyLCByYWRpdXMuaGVpZ2h0KCkgKiAyKSwgYW5nbGVTdGFydCwgYW5nbGVT cGFuKTsKIApAQCAtMTExOSwxMyArMTExOCwxMyBAQCB2b2lkIFJlbmRlck9iamVjdDo6ZHJhd0Fy Y0ZvckJveFNpZGUoR3JhcGhpY3NDb250ZXh0KiBncmFwaGljc0NvbnRleHQsIGludCB4LCBpbgog ICAgICAgICB9CiAgICAgICAgIGNhc2UgSU5TRVQ6CiAgICAgICAgICAgICBpZiAocyA9PSBCU1Rv cCB8fCBzID09IEJTTGVmdCkKLSAgICAgICAgICAgICAgICBjID0gYy5kYXJrKCk7CisgICAgICAg ICAgICAgICAgY29sb3IgPSBjb2xvci5kYXJrKCk7CiAgICAgICAgIGNhc2UgT1VUU0VUOgogICAg ICAgICAgICAgaWYgKHN0eWxlID09IE9VVFNFVCAmJiAocyA9PSBCU0JvdHRvbSB8fCBzID09IEJT UmlnaHQpKQotICAgICAgICAgICAgICAgIGMgPSBjLmRhcmsoKTsKKyAgICAgICAgICAgICAgICBj b2xvciA9IGNvbG9yLmRhcmsoKTsKICAgICAgICAgY2FzZSBTT0xJRDoKICAgICAgICAgICAgIGdy YXBoaWNzQ29udGV4dC0+c2V0U3Ryb2tlU3R5bGUoU29saWRTdHJva2UpOwotICAgICAgICAgICAg Z3JhcGhpY3NDb250ZXh0LT5zZXRTdHJva2VDb2xvcihjLCBtX3N0eWxlLT5jb2xvclNwYWNlKCkp OworICAgICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5zZXRTdHJva2VDb2xvcihjb2xvciwgbV9z dHlsZS0+Y29sb3JTcGFjZSgpKTsKICAgICAgICAgICAgIGdyYXBoaWNzQ29udGV4dC0+c2V0U3Ry b2tlVGhpY2tuZXNzKHRoaWNrbmVzcyk7CiAgICAgICAgICAgICBncmFwaGljc0NvbnRleHQtPnN0 cm9rZUFyYyhJbnRSZWN0KHgsIHksIHJhZGl1cy53aWR0aCgpICogMiwgcmFkaXVzLmhlaWdodCgp ICogMiksIGFuZ2xlU3RhcnQsIGFuZ2xlU3Bhbik7CiAgICAgICAgICAgICBicmVhazsK