46687 2010-09-27 19:00:53 -0700 [chromium] Increase warning level for chromium linux build 2010-09-28 14:49:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jamesr jamesr agl dglazkov fishd thakis tony oldest_to_newest 285996 0 jamesr 2010-09-27 19:00:53 -0700 [chromium] Increase warning level for chromium linux build 285999 1 69009 jamesr 2010-09-27 19:06:35 -0700 Created attachment 69009 Patch 286031 2 69009 thakis 2010-09-27 20:38:13 -0700 Comment on attachment 69009 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=69009&action=review > WebCore/WebCore.gyp/WebCore.gyp:247 > # enable -Wall and -Werror, just in Mac build for now update this comment? > WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp:118 > + || ((direction == PlatformThemeChromiumGtk::East || direction == PlatformThemeChromiumGtk::South) && scrollbar->currentPos() != scrollbar->maximum())) This looks overparenthesized. What's the warning without this? 286212 3 agl 2010-09-28 07:20:41 -0700 LGTM, although I also wonder about the additional ( ) 286311 4 tony 2010-09-28 09:53:55 -0700 (In reply to comment #2) > (From update of attachment 69009 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=69009&action=review > > > WebCore/WebCore.gyp/WebCore.gyp:247 > > # enable -Wall and -Werror, just in Mac build for now > > update this comment? > > > WebCore/platform/chromium/ScrollbarThemeChromiumLinux.cpp:118 > > + || ((direction == PlatformThemeChromiumGtk::East || direction == PlatformThemeChromiumGtk::South) && scrollbar->currentPos() != scrollbar->maximum())) > > This looks overparenthesized. What's the warning without this? There's an a || b && c in there which makes the second pair of () that james added necessary. I think we can drop the first pair of (). 286312 5 69009 tony 2010-09-28 09:54:27 -0700 Comment on attachment 69009 Patch r=me with review comments addressed 286470 6 jamesr 2010-09-28 12:51:59 -0700 gcc requires "a || b && c" have parens around the "b && c" part. The rest of the parens on that line are needed, I believe the rest of the parens are still needed. However I forgot to check in debug as well. Will update. 286472 7 69009 jamesr 2010-09-28 12:52:20 -0700 Comment on attachment 69009 Patch Missed some. 286538 8 69106 jamesr 2010-09-28 14:41:03 -0700 Created attachment 69106 Patch 286539 9 jamesr 2010-09-28 14:41:44 -0700 Fixed the comment in the .gyp and drops one set of parens from ScrollbarThemeChromiumLinux.cpp. 286547 10 jamesr 2010-09-28 14:49:06 -0700 Committed r68564: <http://trac.webkit.org/changeset/68564> 69009 2010-09-27 19:06:35 -0700 2010-09-28 12:52:20 -0700 Patch bug-46687-20100927190634.patch text/plain 13270 jamesr ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OTcyMDNiMmM5M2QwYjJkOTkzYjFmOGVmMWYzZDFhMGE1MGZhMDI1Mi4uOWVkMWJjZDlhNzFhN2U1 NjkzN2E0NDUyYTM0MmQwNzliZGRhZGExMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOSBAQAorMjAxMC0wOS0yNyAgSmFt ZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gSW5jcmVhc2Ugd2FybmluZyBs ZXZlbCBmb3IgY2hyb21pdW0gbGludXggYnVpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2Njg3CisKKyAgICAgICAgVGhpcyBzZXRzIHRoZSBjaHJv bWl1bV9jb2RlIGd5cCB2YXJpYWJsZSB0byAxIGZvciB0aGUgY2hyb21pdW0KKyAgICAgICAgbGlu dXggV2ViQ29yZSBidWlsZCBhbmQgZml4ZXMgdGhlIHdhcm5pbmdzIHRoYXQgZXhwb3Nlcy4gIFRo aXMKKyAgICAgICAgbWF0Y2hlcyB0aGUgY2hyb21pdW0gbWFjIGJ1aWxkJ3MgY29tcGlsZXIgc2V0 dGluZ3MgbW9yZSBjbG9zZWx5CisgICAgICAgIGFuZCBzaG91bGQgY3V0IGRvd24gb24gdGhlIG51 bWJlciBvZiBwYXRjaGVzIHRoYXQgYnJlYWsgbWFjIGJ1dAorICAgICAgICBjb21waWxlIGNsZWFu aW5nIG9uIGxpbnV4LgorCisgICAgICAgICogV2ViQ29yZS5neXAvV2ViQ29yZS5neXA6CisgICAg ICAgICogcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bUxpbnV4LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1MaW51eDo6cGFpbnRCdXR0 b24pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRMaW51eC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpUZXh0UnVuV2Fsa2VyOjpuZXh0U2NyaXB0UnVuKToKKyAgICAg ICAgKFdlYkNvcmU6OlRleHRSdW5XYWxrZXI6OmdldFRleHRSdW4pOgorICAgICAgICAoV2ViQ29y ZTo6VGV4dFJ1bldhbGtlcjo6Z2V0Tm9ybWFsaXplZFRleHRSdW4pOgorICAgICAgICAoV2ViQ29y ZTo6VGV4dFJ1bldhbGtlcjo6c2V0R2x5cGhYUG9zaXRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6 OmdseXBoSW5kZXhGb3JYUG9zaXRpb25JblNjcmlwdFJ1bik6CisgICAgICAgIChXZWJDb3JlOjpG b250OjpvZmZzZXRGb3JQb3NpdGlvbkZvckNvbXBsZXhUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6 OkZvbnQ6OnNlbGVjdGlvblJlY3RGb3JDb21wbGV4VGV4dCk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vSGFyZmJ1enpTa2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Omdl dE91dGxpbmVQb2ludCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5 ZXJSZW5kZXJlckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyUmVuZGVyZXJD aHJvbWl1bTo6dXBkYXRlUm9vdExheWVyVGV4dHVyZVJlY3QpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2dwdS9UZXh0dXJlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvcHlTdWJSZWN0 KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1Db250ZXh0U2tpYTo6cmVhZGJhY2tIYXJk d2FyZVRvU29mdHdhcmUpOgorICAgICAgICAqIHBsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2dpZi9H SUZJbWFnZURlY29kZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R0lGSW1hZ2VEZWNvZGVyOjpz ZXRTaXplKToKKyAgICAgICAgKiBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9naWYvR0lGSW1hZ2VE ZWNvZGVyLmg6CisKIDIwMTAtMDktMjcgIEtlbm5ldGggUnVzc2VsbCAgPGtickBnb29nbGUuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIFF0IGJ1aWxkIGZpeC4gU3R1YiBvdXQgQ2FudmFzUmVu ZGVyaW5nQ29udGV4dDo6Y2hlY2tPcmlnaW4oY29uc3QgSFRNTFZpZGVvRWxlbWVudCopCmRpZmYg LS1naXQgYS9XZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwIGIvV2ViQ29yZS9XZWJDb3Jl Lmd5cC9XZWJDb3JlLmd5cAppbmRleCAyNzQ1Y2ZhZTU3YTQ2ZGFjNWFkMzRiMjkyZmU3YWNmMTdi ZDUyZTYzLi5lNjUxYThlMDk1YTMwNzNhNzE0OGI2YWJkZWZmMGRmYmI5ZDYyN2U2IDEwMDY0NAot LS0gYS9XZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwCisrKyBiL1dlYkNvcmUvV2ViQ29y ZS5neXAvV2ViQ29yZS5neXAKQEAgLTI0NSw3ICsyNDUsMTAgQEAKICAgICAgICAgICAnLi4vcGxh dGZvcm0vdGV4dC9tYWMnLAogICAgICAgICBdLAogICAgICAgICAjIGVuYWJsZSAtV2FsbCBhbmQg LVdlcnJvciwganVzdCBpbiBNYWMgYnVpbGQgZm9yIG5vdwotICAgICAgICAjIEZJWE1FOiBBbHNv IGVuYWJsZSB0aGlzIGZvciBMaW51eC9XaW5kb3dzIGFmdGVyIHZlcmlmeWluZyBubyB3YXJuaW5n cworICAgICAgICAjIEZJWE1FOiBBbHNvIGVuYWJsZSB0aGlzIGZvciBXaW5kb3dzIGFmdGVyIHZl cmlmeWluZyBubyB3YXJuaW5ncworICAgICAgICAnY2hyb21pdW1fY29kZSc6IDEsCisgICAgICB9 XSwKKyAgICAgIFsnT1M9PSJsaW51eCInLCB7CiAgICAgICAgICdjaHJvbWl1bV9jb2RlJzogMSwK ICAgICAgIH1dLAogICAgICAgWydPUz09IndpbiInLCB7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3Bs YXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1MaW51eC5jcHAgYi9XZWJDb3Jl L3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hyb21pdW1MaW51eC5jcHAKaW5kZXgg MTliNGE1NGQ0ODQ3OWE3ZjU4ZmY1NmY0ZmIxNWM5OTE4OGZmNGFkYi4uMDhiZjg4NTk4MTcxMTEy ZWE4ZTBkNTlmZDIxNzQwYzNlNWUyMjM3MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9j aHJvbWl1bS9TY3JvbGxiYXJUaGVtZUNocm9taXVtTGludXguY3BwCisrKyBiL1dlYkNvcmUvcGxh dGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bUxpbnV4LmNwcApAQCAtMTE0LDgg KzExNCw4IEBAIHZvaWQgU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bUxpbnV4OjpwYWludEJ1dHRvbihH cmFwaGljc0NvbnRleHQqIGdjLCBTY3JvbGxiYXIqIHNjCiAKICAgICBDb250cm9sU3RhdGVzIHN0 YXRlcyA9IDA7CiAgICAgLy8gRGV0ZXJtaW5lIGlmIHRoZSBidXR0b24gY2FuIGJlIHByZXNzZWQu Ci0gICAgaWYgKCgoZGlyZWN0aW9uID09IFBsYXRmb3JtVGhlbWVDaHJvbWl1bUd0azo6V2VzdCB8 fCBkaXJlY3Rpb24gPT0gUGxhdGZvcm1UaGVtZUNocm9taXVtR3RrOjpOb3J0aCkgJiYgc2Nyb2xs YmFyLT5jdXJyZW50UG9zKCkpCi0gICAgICAgIHx8IChkaXJlY3Rpb24gPT0gUGxhdGZvcm1UaGVt ZUNocm9taXVtR3RrOjpFYXN0IHx8IGRpcmVjdGlvbiA9PSBQbGF0Zm9ybVRoZW1lQ2hyb21pdW1H dGs6OlNvdXRoKSAmJiBzY3JvbGxiYXItPmN1cnJlbnRQb3MoKSAhPSBzY3JvbGxiYXItPm1heGlt dW0oKSkKKyAgICBpZiAoKCgoZGlyZWN0aW9uID09IFBsYXRmb3JtVGhlbWVDaHJvbWl1bUd0azo6 V2VzdCB8fCBkaXJlY3Rpb24gPT0gUGxhdGZvcm1UaGVtZUNocm9taXVtR3RrOjpOb3J0aCkgJiYg c2Nyb2xsYmFyLT5jdXJyZW50UG9zKCkpKQorICAgICAgICB8fCAoKGRpcmVjdGlvbiA9PSBQbGF0 Zm9ybVRoZW1lQ2hyb21pdW1HdGs6OkVhc3QgfHwgZGlyZWN0aW9uID09IFBsYXRmb3JtVGhlbWVD aHJvbWl1bUd0azo6U291dGgpICYmIHNjcm9sbGJhci0+Y3VycmVudFBvcygpICE9IHNjcm9sbGJh ci0+bWF4aW11bSgpKSkKICAgICAgICAgc3RhdGVzIHw9IEVuYWJsZWRTdGF0ZTsKIAogICAgIGlm IChzdGF0ZXMgJiBFbmFibGVkU3RhdGUpIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vRm9udExpbnV4LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vRm9udExpbnV4LmNwcAppbmRleCAzZDJmZWQzNWVjZjQ2NGM0ZTQ0OGFiZTI0 OGI3YThjZDQ0ZjE5NGUzLi5hMjQyNTIzZTgwNTA1NWM5OTgwODFkMWI1OTM5M2U1OTk5MjgwN2Fi IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRMaW51 eC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250TGludXgu Y3BwCkBAIC0zMTMsNyArMzEzLDcgQEAgcHVibGljOgogICAgICAgICAgICAgLy8gU28gd2UgYWxs b3cgdGhhdCB0byBydW4gZmlyc3QsIHRoZW4gZG8gYSBzZWNvbmQgcGFzcyBvdmVyIHRoZSByYW5n ZSBpdAogICAgICAgICAgICAgLy8gZm91bmQgYW5kIHRha2UgdGhlIGxhcmdlc3Qgc3VicmVnaW9u IHRoYXQgc3RheXMgd2l0aGluIGEgc2luZ2xlIGZvbnQuCiAgICAgICAgICAgICBjb25zdCBGb250 RGF0YSogZ2x5cGhEYXRhID0gbV9mb250LT5nbHlwaERhdGFGb3JDaGFyYWN0ZXIobV9pdGVtLnN0 cmluZ1ttX2l0ZW0uaXRlbS5wb3NdLCBmYWxzZSwgZmFsc2UpLmZvbnREYXRhOwotICAgICAgICAg ICAgaW50IGVuZE9mUnVuOworICAgICAgICAgICAgdW5zaWduZWQgZW5kT2ZSdW47CiAgICAgICAg ICAgICBmb3IgKGVuZE9mUnVuID0gMTsgZW5kT2ZSdW4gPCBtX2l0ZW0uaXRlbS5sZW5ndGg7ICsr ZW5kT2ZSdW4pIHsKICAgICAgICAgICAgICAgICBjb25zdCBGb250RGF0YSogbmV4dEdseXBoRGF0 YSA9IG1fZm9udC0+Z2x5cGhEYXRhRm9yQ2hhcmFjdGVyKG1faXRlbS5zdHJpbmdbbV9pdGVtLml0 ZW0ucG9zICsgZW5kT2ZSdW5dLCBmYWxzZSwgZmFsc2UpLmZvbnREYXRhOwogICAgICAgICAgICAg ICAgIGlmIChuZXh0R2x5cGhEYXRhICE9IGdseXBoRGF0YSkKQEAgLTQwNiw3ICs0MDYsNyBAQCBw cml2YXRlOgogICAgICAgICAvLyBIYXJmYnV6eiB3aWxsIGRvIHRoZSBzYW1lIHRoaW5nIGZvciB1 cyB1c2luZyB0aGUgR1NVQiB0YWJsZS4KICAgICAgICAgLy8gMikgQ29udmVydCBzcGFjaW5nIGNo YXJhY3RlcnMgaW50byBwbGFpbiBzcGFjZXMsIGFzIHNvbWUgZm9udHMgd2lsbCBwcm92aWRlIGds eXBocwogICAgICAgICAvLyBmb3IgY2hhcmFjdGVycyBsaWtlICdcbicgb3RoZXJ3aXNlLgotICAg ICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgb3JpZ2luYWxSdW4ubGVuZ3RoKCk7ICsraSkg eworICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IG9yaWdpbmFsUnVuLmxlbmd0aCgpOyArK2kp IHsKICAgICAgICAgICAgIFVDaGFyIGNoID0gb3JpZ2luYWxSdW5baV07CiAgICAgICAgICAgICBV QmxvY2tDb2RlIGJsb2NrID0gOjp1YmxvY2tfZ2V0Q29kZShjaCk7CiAgICAgICAgICAgICBpZiAo YmxvY2sgPT0gVUJMT0NLX0NPTUJJTklOR19ESUFDUklUSUNBTF9NQVJLUyB8fCAoRm9udDo6dHJl YXRBc1NwYWNlKGNoKSAmJiBjaCAhPSAnICcpKSB7CkBAIC00MjgsNyArNDI4LDcgQEAgcHJpdmF0 ZToKICAgICAgICAgbm9ybWFsaXplZFN0cmluZy5leHRyYWN0KG1fbm9ybWFsaXplZEJ1ZmZlci5n ZXQoKSwgbm9ybWFsaXplZFN0cmluZy5sZW5ndGgoKSArIDEsIGVycm9yKTsKICAgICAgICAgQVNT RVJUKFVfU1VDQ0VTUyhlcnJvcikpOwogCi0gICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkg PCBub3JtYWxpemVkU3RyaW5nLmxlbmd0aCgpOyArK2kpIHsKKyAgICAgICAgZm9yIChpbnQgaSA9 IDA7IGkgPCBub3JtYWxpemVkU3RyaW5nLmxlbmd0aCgpOyArK2kpIHsKICAgICAgICAgICAgIGlm IChGb250Ojp0cmVhdEFzU3BhY2UobV9ub3JtYWxpemVkQnVmZmVyW2ldKSkKICAgICAgICAgICAg ICAgICBtX25vcm1hbGl6ZWRCdWZmZXJbaV0gPSAnICc7CiAgICAgICAgIH0KQEAgLTUxNyw3ICs1 MTcsNyBAQCBwcml2YXRlOgogICAgICAgICAvLyBnbHlwaC4KICAgICAgICAgdW5zaWduZWQgbG9n Q2x1c3RlcnNJbmRleCA9IGlzUlRMID8gbV9pdGVtLm51bV9nbHlwaHMgLSAxIDogMDsKIAotICAg ICAgICBmb3IgKGludCBpdGVyID0gMDsgaXRlciA8IG1faXRlbS5udW1fZ2x5cGhzOyArK2l0ZXIp IHsKKyAgICAgICAgZm9yICh1bnNpZ25lZCBpdGVyID0gMDsgaXRlciA8IG1faXRlbS5udW1fZ2x5 cGhzOyArK2l0ZXIpIHsKICAgICAgICAgICAgIC8vIEdseXBocyBhcmUgc3RvcmVkIGluIGxvZ2lj YWwgb3JkZXIsIGJ1dCBmb3IgbGF5b3V0IHB1cnBvc2VzIHdlCiAgICAgICAgICAgICAvLyBhbHdh eXMgZ28gbGVmdCB0byByaWdodC4KICAgICAgICAgICAgIGludCBpID0gaXNSVEwgPyBtX2l0ZW0u bnVtX2dseXBocyAtIGl0ZXIgLSAxIDogaXRlcjsKQEAgLTY4Myw3ICs2ODMsNyBAQCBzdGF0aWMg aW50IGdseXBoSW5kZXhGb3JYUG9zaXRpb25JblNjcmlwdFJ1bihjb25zdCBUZXh0UnVuV2Fsa2Vy JiB3YWxrZXIsIGludCB4KQogICAgICAgICAgICAgeCAtPSB0cnVuY2F0ZUZpeGVkUG9pbnRUb0lu dGVnZXIoYWR2YW5jZXNbZ2x5cGhJbmRleF0pOwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKLSAg ICAgICAgZm9yIChnbHlwaEluZGV4ID0gMDsgZ2x5cGhJbmRleCA8IHdhbGtlci5sZW5ndGgoKTsg KytnbHlwaEluZGV4KSB7CisgICAgICAgIGZvciAoZ2x5cGhJbmRleCA9IDA7IHN0YXRpY19jYXN0 PHVuc2lnbmVkPihnbHlwaEluZGV4KSA8IHdhbGtlci5sZW5ndGgoKTsgKytnbHlwaEluZGV4KSB7 CiAgICAgICAgICAgICBpZiAoeCA8IHRydW5jYXRlRml4ZWRQb2ludFRvSW50ZWdlcihhZHZhbmNl c1tnbHlwaEluZGV4XSkpCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB4IC09 IHRydW5jYXRlRml4ZWRQb2ludFRvSW50ZWdlcihhZHZhbmNlc1tnbHlwaEluZGV4XSk7CkBAIC03 NDEsNyArNzQxLDcgQEAgaW50IEZvbnQ6Om9mZnNldEZvclBvc2l0aW9uRm9yQ29tcGxleFRleHQo Y29uc3QgVGV4dFJ1biYgcnVuLCBmbG9hdCB4RmxvYXQsCiAgICAgICAgIGlmICh3YWxrZXIucnRs KCkpCiAgICAgICAgICAgICBiYXNlUG9zaXRpb24gLT0gd2Fsa2VyLm51bUNvZGVQb2ludHMoKTsK IAotICAgICAgICBpZiAoeCA+PSAwICYmIHggPCB3YWxrZXIud2lkdGgoKSkgeworICAgICAgICBp ZiAoeCA+PSAwICYmIHN0YXRpY19jYXN0PHVuc2lnbmVkPih4KSA8IHdhbGtlci53aWR0aCgpKSB7 CiAgICAgICAgICAgICAvLyBUaGUgeCB2YWx1ZSBpbiBxdWVzdGlvbiBpcyB3aXRoaW4gdGhpcyBz Y3JpcHQgcnVuLiBXZSBjb25zaWRlcgogICAgICAgICAgICAgLy8gZWFjaCBnbHlwaCBpbiBwcmVz ZW50YXRpb24gb3JkZXIgYW5kIHN0b3Agd2hlbiB3ZSBmaW5kIHRoZSBvbmUKICAgICAgICAgICAg IC8vIGNvdmVyaW5nIHRoaXMgcG9zaXRpb24uCkBAIC04MDMsNyArODAzLDcgQEAgRmxvYXRSZWN0 IEZvbnQ6OnNlbGVjdGlvblJlY3RGb3JDb21wbGV4VGV4dChjb25zdCBUZXh0UnVuJiBydW4sCiAg ICAgICAgIGlmICh3YWxrZXIucnRsKCkpCiAgICAgICAgICAgICBiYXNlIC09IHdhbGtlci53aWR0 aCgpOwogCi0gICAgICAgIGlmIChmcm9tWCA9PSAtMSAmJiBmcm9tIDwgd2Fsa2VyLm51bUNvZGVQ b2ludHMoKSkgeworICAgICAgICBpZiAoZnJvbVggPT0gLTEgJiYgZnJvbSA+PSAwICYmIHN0YXRp Y19jYXN0PHVuc2lnbmVkPihmcm9tKSA8IHdhbGtlci5udW1Db2RlUG9pbnRzKCkpIHsKICAgICAg ICAgICAgIC8vIHxmcm9tfCBpcyB3aXRoaW4gdGhpcyBzY3JpcHQgcnVuLiBTbyB3ZSBpbmRleCB0 aGUgY2x1c3RlcnMgbG9nIHRvCiAgICAgICAgICAgICAvLyBmaW5kIHdoaWNoIGdseXBoIHRoaXMg Y29kZS1wb2ludCBjb250cmlidXRlZCB0byBhbmQgZmluZCBpdHMgeAogICAgICAgICAgICAgLy8g cG9zaXRpb24uCkBAIC04MTMsNyArODEzLDcgQEAgRmxvYXRSZWN0IEZvbnQ6OnNlbGVjdGlvblJl Y3RGb3JDb21wbGV4VGV4dChjb25zdCBUZXh0UnVuJiBydW4sCiAgICAgICAgIH0gZWxzZQogICAg ICAgICAgICAgZnJvbSAtPSB3YWxrZXIubnVtQ29kZVBvaW50cygpOwogCi0gICAgICAgIGlmICh0 b1ggPT0gLTEgJiYgdG8gPCB3YWxrZXIubnVtQ29kZVBvaW50cygpKSB7CisgICAgICAgIGlmICh0 b1ggPT0gLTEgJiYgdG8gPj0gMCAmJiBzdGF0aWNfY2FzdDx1bnNpZ25lZD4odG8pIDwgd2Fsa2Vy Lm51bUNvZGVQb2ludHMoKSkgewogICAgICAgICAgICAgaW50IGdseXBoID0gd2Fsa2VyLmxvZ0Ns dXN0ZXJzKClbdG9dOwogICAgICAgICAgICAgdG9YID0gYmFzZSArIHdhbGtlci54UG9zaXRpb25z KClbZ2x5cGhdOwogICAgICAgICAgICAgdG9BZHZhbmNlID0gd2Fsa2VyLmFkdmFuY2VzKClbZ2x5 cGhdOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9IYXJm YnV6elNraWEuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9IYXJmYnV6 elNraWEuY3BwCmluZGV4IDU5ZTgxMjI1MjljYzhjMzc2Nzc2OTA1ODY1NTNmYTkxZjdmMDFkNTQu LjA1NmQ4ZWI4Y2IzYjkxMGYwMGI0MTUyYzNhNWUxNDU2M2JlNDUyNTAgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSGFyZmJ1enpTa2lhLmNwcAorKysgYi9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0hhcmZidXp6U2tpYS5jcHAKQEAgLTE1 MCw3ICsxNTAsNyBAQCBzdGF0aWMgSEJfRXJyb3IgZ2V0T3V0bGluZVBvaW50KEhCX0ZvbnQgaGJG b250LCBIQl9HbHlwaCBnbHlwaCwgaW50IGZsYWdzLCBoYl91aQogICAgIFNrUGF0aCBwYXRoOwog ICAgIHBhaW50LmdldFRleHRQYXRoKCZnbHlwaDE2LCBzaXplb2YoZ2x5cGgxNiksIDAsIDAsICZw YXRoKTsKICAgICBpbnQgbnVtUG9pbnRzID0gcGF0aC5nZXRQb2ludHMoMCwgMCk7Ci0gICAgaWYg KHBvaW50ID49IG51bVBvaW50cykKKyAgICBpZiAocG9pbnQgPj0gc3RhdGljX2Nhc3Q8dW5zaWdu ZWQ+KG51bVBvaW50cykpCiAgICAgICAgIHJldHVybiBIQl9FcnJfSW52YWxpZF9TdWJUYWJsZTsK ICAgICBTa1BvaW50KiBwb2ludHMgPSByZWludGVycHJldF9jYXN0PFNrUG9pbnQqPihmYXN0TWFs bG9jKHNpemVvZihTa1BvaW50KSAqIChwb2ludCArIDEpKSk7CiAgICAgaWYgKCFwb2ludHMpCmRp ZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVyUmVuZGVy ZXJDaHJvbWl1bS5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xheWVy UmVuZGVyZXJDaHJvbWl1bS5jcHAKaW5kZXggMDNjOGQ3YjA3MWQ5ZDA2NzYzZDlmNmZjZDY1NWZi Y2I5NDg4Mjk4Ni4uNjZjYjBmNzU5MWJlYWRiYzQ5ODUyNmZmOWJiZGJjNzE5Y2VlNTVlMiAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXllclJlbmRlcmVy Q2hyb21pdW0uY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5 ZXJSZW5kZXJlckNocm9taXVtLmNwcApAQCAtMjU4LDkgKzI1OCw3IEBAIHZvaWQgTGF5ZXJSZW5k ZXJlckNocm9taXVtOjp1cGRhdGVSb290TGF5ZXJUZXh0dXJlUmVjdChjb25zdCBJbnRSZWN0JiB1 cGRhdGVSZWN0CiAjaWYgUExBVEZPUk0oU0tJQSkKICAgICAvLyBHZXQgdGhlIGNvbnRlbnRzIG9m IHRoZSB1cGRhdGVkIHJlY3QuCiAgICAgY29uc3QgU2tCaXRtYXAgYml0bWFwID0gbV9yb290TGF5 ZXJDYW52YXMtPmdldERldmljZSgpLT5hY2Nlc3NCaXRtYXAoZmFsc2UpOwotICAgIGludCBiaXRt YXBXaWR0aCA9IGJpdG1hcC53aWR0aCgpOwotICAgIGludCBiaXRtYXBIZWlnaHQgPSBiaXRtYXAu aGVpZ2h0KCk7Ci0gICAgQVNTRVJUKGJpdG1hcFdpZHRoID09IHVwZGF0ZVJlY3Qud2lkdGgoKSAm JiBiaXRtYXBIZWlnaHQgPT0gdXBkYXRlUmVjdC5oZWlnaHQoKSk7CisgICAgQVNTRVJUKGJpdG1h cC53aWR0aCgpID09IHVwZGF0ZVJlY3Qud2lkdGgoKSAmJiBiaXRtYXAuaGVpZ2h0KCkgPT0gdXBk YXRlUmVjdC5oZWlnaHQoKSk7CiAgICAgdm9pZCogcGl4ZWxzID0gYml0bWFwLmdldFBpeGVscygp OwogI2VsaWYgUExBVEZPUk0oQ0cpCiAgICAgLy8gR2V0IHRoZSBjb250ZW50cyBvZiB0aGUgdXBk YXRlZCByZWN0LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvVGV4 dHVyZS5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9UZXh0dXJlLmNwcAppbmRl eCA5NTQzNmJhOGM1ZjJiZTJjZTVmZWM2NzVjNzgzMDRjNDE4NWIzMWJhLi42MDIzZmU5NDk1NmU3 MGRkZGEzODc2OGVhOGNmZDk0YzU3ZjI0NGEyIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dwdS9UZXh0dXJlLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dwdS9UZXh0dXJlLmNwcApAQCAtMTI5LDcgKzEyOSw3IEBAIHN0YXRpYyB1aW50MzJfdCogY29w eVN1YlJlY3QodWludDMyX3QqIHNyYywgaW50IHNyY1gsIGludCBzcmNZLCB1aW50MzJfdCogZHN0 LCBpCiAgICAgICAgIGZvciAoaW50IHkgPSAwOyB5IDwgaGVpZ2h0OyArK3kpIHsKICAgICAgICAg ICAgIGZvciAoaW50IHggPSAwOyB4IDwgd2lkdGggOyArK3gpIHsKICAgICAgICAgICAgICAgICB1 aW50MzJfdCBwaXhlbCA9IHNyY09mZnNldFt4ICsgeSAqIHNyY1N0cmlkZV07Ci0gICAgICAgICAg ICAgICAgKmRzdFBpeGVsID0gcGl4ZWwgJiAweEZGMDBGRjAwIHwgKChwaXhlbCAmIDB4MDBGRjAw MDApID4+IDE2KSB8ICgocGl4ZWwgJiAweDAwMDAwMEZGKSA8PCAxNik7CisgICAgICAgICAgICAg ICAgKmRzdFBpeGVsID0gKHBpeGVsICYgMHhGRjAwRkYwMCkgfCAoKHBpeGVsICYgMHgwMEZGMDAw MCkgPj4gMTYpIHwgKChwaXhlbCAmIDB4MDAwMDAwRkYpIDw8IDE2KTsKICAgICAgICAgICAgICAg ICBkc3RQaXhlbCsrOwogICAgICAgICAgICAgfQogICAgICAgICB9CmRpZmYgLS1naXQgYS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5jcHAgYi9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5jcHAKaW5kZXgg Y2NhZWZiYThiYzYxNTc4YmIzOTdlOTVjYTQ2MzFhZTBlZjE0YzdhMi4uYjQ2OTMxMmZhMDk4ZjZi NThjY2Q1YThkOGNkNGNmZmQxNGExZWMyZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNwcApAQCAtODQ1LDcgKzg0NSw3 IEBAIHZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6cmVhZGJhY2tIYXJkd2FyZVRvU29mdHdhcmUo KSBjb25zdAogICAgICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCB3aWR0aDsgKytpKSB7CiAg ICAgICAgICAgICAgICAgdWludDMyX3QgcGl4ZWwgPSBwaXhlbHNbaV07CiAgICAgICAgICAgICAg ICAgLy8gU3dpenpsZXMgZnJvbSBSR0JBIC0+IEJHUkEuCi0gICAgICAgICAgICAgICAgcGl4ZWxz W2ldID0gcGl4ZWwgJiAweEZGMDBGRjAwIHwgKChwaXhlbCAmIDB4MDBGRjAwMDApID4+IDE2KSB8 ICgocGl4ZWwgJiAweDAwMDAwMEZGKSA8PCAxNik7CisgICAgICAgICAgICAgICAgcGl4ZWxzW2ld ID0gKHBpeGVsICYgMHhGRjAwRkYwMCkgfCAoKHBpeGVsICYgMHgwMEZGMDAwMCkgPj4gMTYpIHwg KChwaXhlbCAmIDB4MDAwMDAwRkYpIDw8IDE2KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQog ICAgIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvZ2lmL0dJ RkltYWdlRGVjb2Rlci5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2dpZi9H SUZJbWFnZURlY29kZXIuY3BwCmluZGV4IDM2YTdiZDdhMzkzNWU2NmMzYjQ4Yjc4ODAwOTc2ODBk YTk1OGZhMWMuLjQ3OTc0OTVmNTVjZTU2NmE2NDQ5YzliZjJjODU0MzFmYzViZWZlMTkgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvZ2lmL0dJRkltYWdlRGVjb2Rl ci5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9naWYvR0lGSW1hZ2VE ZWNvZGVyLmNwcApAQCAtNjAsNyArNjAsNyBAQCBib29sIEdJRkltYWdlRGVjb2Rlcjo6aXNTaXpl QXZhaWxhYmxlKCkKICAgICByZXR1cm4gSW1hZ2VEZWNvZGVyOjppc1NpemVBdmFpbGFibGUoKTsK IH0KIAotYm9vbCBHSUZJbWFnZURlY29kZXI6OnNldFNpemUodW5zaWduZWQgd2lkdGgsIHVuc2ln bmVkIGhlaWdodCkKK2Jvb2wgR0lGSW1hZ2VEZWNvZGVyOjpzZXRTaXplKGludCB3aWR0aCwgaW50 IGhlaWdodCkKIHsKICAgICBpZiAoSW1hZ2VEZWNvZGVyOjppc1NpemVBdmFpbGFibGUoKSAmJiBz aXplKCkud2lkdGgoKSA9PSB3aWR0aCAmJiBzaXplKCkuaGVpZ2h0KCkgPT0gaGVpZ2h0KQogICAg ICAgICByZXR1cm4gdHJ1ZTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVj b2RlcnMvZ2lmL0dJRkltYWdlRGVjb2Rlci5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNv ZGVycy9naWYvR0lGSW1hZ2VEZWNvZGVyLmgKaW5kZXggMjFjMWM1N2JhMWU3MjgzMTljZDQxY2Vk YjIyMzhhZGYxNWZhYjRhYS4uMGE4OGZmZGQyM2VkZmZiMjlhYjdlYzZkZWU2ZmQ0MWRmOTY3ZDcy OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9naWYvR0lGSW1h Z2VEZWNvZGVyLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9naWYvR0lG SW1hZ2VEZWNvZGVyLmgKQEAgLTQ1LDcgKzQ1LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAg ICAgICB2aXJ0dWFsIFN0cmluZyBmaWxlbmFtZUV4dGVuc2lvbigpIGNvbnN0IHsgcmV0dXJuICJn aWYiOyB9CiAgICAgICAgIHZpcnR1YWwgdm9pZCBzZXREYXRhKFNoYXJlZEJ1ZmZlciogZGF0YSwg Ym9vbCBhbGxEYXRhUmVjZWl2ZWQpOwogICAgICAgICB2aXJ0dWFsIGJvb2wgaXNTaXplQXZhaWxh YmxlKCk7Ci0gICAgICAgIHZpcnR1YWwgYm9vbCBzZXRTaXplKHVuc2lnbmVkIHdpZHRoLCB1bnNp Z25lZCBoZWlnaHQpOworICAgICAgICB2aXJ0dWFsIGJvb2wgc2V0U2l6ZShpbnQgd2lkdGgsIGlu dCBoZWlnaHQpOwogICAgICAgICB2aXJ0dWFsIHNpemVfdCBmcmFtZUNvdW50KCk7CiAgICAgICAg IHZpcnR1YWwgaW50IHJlcGV0aXRpb25Db3VudCgpIGNvbnN0OwogICAgICAgICB2aXJ0dWFsIFJH QkEzMkJ1ZmZlciogZnJhbWVCdWZmZXJBdEluZGV4KHNpemVfdCBpbmRleCk7Cg== 69106 2010-09-28 14:41:03 -0700 2010-09-28 14:46:03 -0700 Patch bug-46687-20100928144102.patch text/plain 13166 jamesr ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTYxMWVjYzYyN2NlZDc3YzZmYzNhZmRmNTYzMjEyYzNjOTcwMjYyOC4uODc2NDgzOGJjMTczOGZk ZTEwMmEzN2JiYzI4OGE1MWExMDIwMmFlZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOSBAQAorMjAxMC0wOS0yNyAgSmFt ZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gSW5jcmVhc2Ugd2FybmluZyBs ZXZlbCBmb3IgY2hyb21pdW0gbGludXggYnVpbGQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2Njg3CisKKyAgICAgICAgVGhpcyBzZXRzIHRoZSBjaHJv bWl1bV9jb2RlIGd5cCB2YXJpYWJsZSB0byAxIGZvciB0aGUgY2hyb21pdW0KKyAgICAgICAgbGlu dXggV2ViQ29yZSBidWlsZCBhbmQgZml4ZXMgdGhlIHdhcm5pbmdzIHRoYXQgZXhwb3Nlcy4gIFRo aXMKKyAgICAgICAgbWF0Y2hlcyB0aGUgY2hyb21pdW0gbWFjIGJ1aWxkJ3MgY29tcGlsZXIgc2V0 dGluZ3MgbW9yZSBjbG9zZWx5CisgICAgICAgIGFuZCBzaG91bGQgY3V0IGRvd24gb24gdGhlIG51 bWJlciBvZiBwYXRjaGVzIHRoYXQgYnJlYWsgbWFjIGJ1dAorICAgICAgICBjb21waWxlIGNsZWFu aW5nIG9uIGxpbnV4LgorCisgICAgICAgICogV2ViQ29yZS5neXAvV2ViQ29yZS5neXA6CisgICAg ICAgICogcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFyVGhlbWVDaHJvbWl1bUxpbnV4LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGJhclRoZW1lQ2hyb21pdW1MaW51eDo6cGFpbnRCdXR0 b24pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRMaW51eC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpUZXh0UnVuV2Fsa2VyOjpuZXh0U2NyaXB0UnVuKToKKyAgICAg ICAgKFdlYkNvcmU6OlRleHRSdW5XYWxrZXI6OmdldFRleHRSdW4pOgorICAgICAgICAoV2ViQ29y ZTo6VGV4dFJ1bldhbGtlcjo6Z2V0Tm9ybWFsaXplZFRleHRSdW4pOgorICAgICAgICAoV2ViQ29y ZTo6VGV4dFJ1bldhbGtlcjo6c2V0R2x5cGhYUG9zaXRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6 OmdseXBoSW5kZXhGb3JYUG9zaXRpb25JblNjcmlwdFJ1bik6CisgICAgICAgIChXZWJDb3JlOjpG b250OjpvZmZzZXRGb3JQb3NpdGlvbkZvckNvbXBsZXhUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6 OkZvbnQ6OnNlbGVjdGlvblJlY3RGb3JDb21wbGV4VGV4dCk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vSGFyZmJ1enpTa2lhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Omdl dE91dGxpbmVQb2ludCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5 ZXJSZW5kZXJlckNocm9taXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheWVyUmVuZGVyZXJD aHJvbWl1bTo6dXBkYXRlUm9vdExheWVyVGV4dHVyZVJlY3QpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL2dwdS9UZXh0dXJlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvcHlTdWJSZWN0 KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1Db250ZXh0U2tpYTo6cmVhZGJhY2tIYXJk d2FyZVRvU29mdHdhcmUpOgorICAgICAgICAqIHBsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2dpZi9H SUZJbWFnZURlY29kZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R0lGSW1hZ2VEZWNvZGVyOjpz ZXRTaXplKToKKyAgICAgICAgKiBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9naWYvR0lGSW1hZ2VE ZWNvZGVyLmg6CisKIDIwMTAtMDktMjggIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv V2ViQ29yZS5neXAvV2ViQ29yZS5neXAgYi9XZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lw CmluZGV4IDhmZGEwNGEyZjgzYmRlMjVlNTdiNWM3MzUzMzU4ZDk0YmQ1OGNkOWEuLjRiYTFhMzVh ZTM4NTQ4NGI3NjBlN2Q5ZDM2OGQxNmYyNTZjNDIyZTkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvV2Vi Q29yZS5neXAvV2ViQ29yZS5neXAKKysrIGIvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5 cApAQCAtMjQ0LDggKzI0NCwxMSBAQAogICAgICAgICAgICcuLi9wbGF0Zm9ybS9tYWMnLAogICAg ICAgICAgICcuLi9wbGF0Zm9ybS90ZXh0L21hYycsCiAgICAgICAgIF0sCi0gICAgICAgICMgZW5h YmxlIC1XYWxsIGFuZCAtV2Vycm9yLCBqdXN0IGluIE1hYyBidWlsZCBmb3Igbm93Ci0gICAgICAg ICMgRklYTUU6IEFsc28gZW5hYmxlIHRoaXMgZm9yIExpbnV4L1dpbmRvd3MgYWZ0ZXIgdmVyaWZ5 aW5nIG5vIHdhcm5pbmdzCisgICAgICAgICMgZW5hYmxlIC1XYWxsIGFuZCAtV2Vycm9yLCBqdXN0 IGZvciBNYWMgYW5kIExpbnV4IGJ1aWxkcyBmb3Igbm93CisgICAgICAgICMgRklYTUU6IEFsc28g ZW5hYmxlIHRoaXMgZm9yIFdpbmRvd3MgYWZ0ZXIgdmVyaWZ5aW5nIG5vIHdhcm5pbmdzCisgICAg ICAgICdjaHJvbWl1bV9jb2RlJzogMSwKKyAgICAgIH1dLAorICAgICAgWydPUz09ImxpbnV4Iics IHsKICAgICAgICAgJ2Nocm9taXVtX2NvZGUnOiAxLAogICAgICAgfV0sCiAgICAgICBbJ09TPT0i d2luIicsIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xsYmFy VGhlbWVDaHJvbWl1bUxpbnV4LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vU2Nyb2xs YmFyVGhlbWVDaHJvbWl1bUxpbnV4LmNwcAppbmRleCAxOWI0YTU0ZDQ4NDc5YTdmNThmZjU2ZjRm YjE1Yzk5MTg4ZmY0YWRiLi5kOGYyYzc5YTQ2OGExYWFlNGNhZTgxNTFmMDA2NDc1ZWY1ZjVkYzU0 IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Njcm9sbGJhclRoZW1lQ2hy b21pdW1MaW51eC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9TY3JvbGxiYXJU aGVtZUNocm9taXVtTGludXguY3BwCkBAIC0xMTUsNyArMTE1LDcgQEAgdm9pZCBTY3JvbGxiYXJU aGVtZUNocm9taXVtTGludXg6OnBhaW50QnV0dG9uKEdyYXBoaWNzQ29udGV4dCogZ2MsIFNjcm9s bGJhciogc2MKICAgICBDb250cm9sU3RhdGVzIHN0YXRlcyA9IDA7CiAgICAgLy8gRGV0ZXJtaW5l IGlmIHRoZSBidXR0b24gY2FuIGJlIHByZXNzZWQuCiAgICAgaWYgKCgoZGlyZWN0aW9uID09IFBs YXRmb3JtVGhlbWVDaHJvbWl1bUd0azo6V2VzdCB8fCBkaXJlY3Rpb24gPT0gUGxhdGZvcm1UaGVt ZUNocm9taXVtR3RrOjpOb3J0aCkgJiYgc2Nyb2xsYmFyLT5jdXJyZW50UG9zKCkpCi0gICAgICAg IHx8IChkaXJlY3Rpb24gPT0gUGxhdGZvcm1UaGVtZUNocm9taXVtR3RrOjpFYXN0IHx8IGRpcmVj dGlvbiA9PSBQbGF0Zm9ybVRoZW1lQ2hyb21pdW1HdGs6OlNvdXRoKSAmJiBzY3JvbGxiYXItPmN1 cnJlbnRQb3MoKSAhPSBzY3JvbGxiYXItPm1heGltdW0oKSkKKyAgICAgICAgfHwgKChkaXJlY3Rp b24gPT0gUGxhdGZvcm1UaGVtZUNocm9taXVtR3RrOjpFYXN0IHx8IGRpcmVjdGlvbiA9PSBQbGF0 Zm9ybVRoZW1lQ2hyb21pdW1HdGs6OlNvdXRoKSAmJiBzY3JvbGxiYXItPmN1cnJlbnRQb3MoKSAh PSBzY3JvbGxiYXItPm1heGltdW0oKSkpCiAgICAgICAgIHN0YXRlcyB8PSBFbmFibGVkU3RhdGU7 CiAKICAgICBpZiAoc3RhdGVzICYgRW5hYmxlZFN0YXRlKSB7CmRpZmYgLS1naXQgYS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRMaW51eC5jcHAgYi9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRMaW51eC5jcHAKaW5kZXggM2QyZmVkMzVlY2Y0NjRj NGU0NDhhYmUyNDhiN2E4Y2Q0NGYxOTRlMy4uYTI0MjUyM2U4MDUwNTVjOTk4MDgxZDFiNTkzOTNl NTk5OTI4MDdhYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9Gb250TGludXguY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Rm9udExpbnV4LmNwcApAQCAtMzEzLDcgKzMxMyw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgIC8v IFNvIHdlIGFsbG93IHRoYXQgdG8gcnVuIGZpcnN0LCB0aGVuIGRvIGEgc2Vjb25kIHBhc3Mgb3Zl ciB0aGUgcmFuZ2UgaXQKICAgICAgICAgICAgIC8vIGZvdW5kIGFuZCB0YWtlIHRoZSBsYXJnZXN0 IHN1YnJlZ2lvbiB0aGF0IHN0YXlzIHdpdGhpbiBhIHNpbmdsZSBmb250LgogICAgICAgICAgICAg Y29uc3QgRm9udERhdGEqIGdseXBoRGF0YSA9IG1fZm9udC0+Z2x5cGhEYXRhRm9yQ2hhcmFjdGVy KG1faXRlbS5zdHJpbmdbbV9pdGVtLml0ZW0ucG9zXSwgZmFsc2UsIGZhbHNlKS5mb250RGF0YTsK LSAgICAgICAgICAgIGludCBlbmRPZlJ1bjsKKyAgICAgICAgICAgIHVuc2lnbmVkIGVuZE9mUnVu OwogICAgICAgICAgICAgZm9yIChlbmRPZlJ1biA9IDE7IGVuZE9mUnVuIDwgbV9pdGVtLml0ZW0u bGVuZ3RoOyArK2VuZE9mUnVuKSB7CiAgICAgICAgICAgICAgICAgY29uc3QgRm9udERhdGEqIG5l eHRHbHlwaERhdGEgPSBtX2ZvbnQtPmdseXBoRGF0YUZvckNoYXJhY3RlcihtX2l0ZW0uc3RyaW5n W21faXRlbS5pdGVtLnBvcyArIGVuZE9mUnVuXSwgZmFsc2UsIGZhbHNlKS5mb250RGF0YTsKICAg ICAgICAgICAgICAgICBpZiAobmV4dEdseXBoRGF0YSAhPSBnbHlwaERhdGEpCkBAIC00MDYsNyAr NDA2LDcgQEAgcHJpdmF0ZToKICAgICAgICAgLy8gSGFyZmJ1enogd2lsbCBkbyB0aGUgc2FtZSB0 aGluZyBmb3IgdXMgdXNpbmcgdGhlIEdTVUIgdGFibGUuCiAgICAgICAgIC8vIDIpIENvbnZlcnQg c3BhY2luZyBjaGFyYWN0ZXJzIGludG8gcGxhaW4gc3BhY2VzLCBhcyBzb21lIGZvbnRzIHdpbGwg cHJvdmlkZSBnbHlwaHMKICAgICAgICAgLy8gZm9yIGNoYXJhY3RlcnMgbGlrZSAnXG4nIG90aGVy d2lzZS4KLSAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG9yaWdpbmFsUnVuLmxlbmd0 aCgpOyArK2kpIHsKKyAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBvcmlnaW5hbFJ1bi5sZW5n dGgoKTsgKytpKSB7CiAgICAgICAgICAgICBVQ2hhciBjaCA9IG9yaWdpbmFsUnVuW2ldOwogICAg ICAgICAgICAgVUJsb2NrQ29kZSBibG9jayA9IDo6dWJsb2NrX2dldENvZGUoY2gpOwogICAgICAg ICAgICAgaWYgKGJsb2NrID09IFVCTE9DS19DT01CSU5JTkdfRElBQ1JJVElDQUxfTUFSS1MgfHwg KEZvbnQ6OnRyZWF0QXNTcGFjZShjaCkgJiYgY2ggIT0gJyAnKSkgewpAQCAtNDI4LDcgKzQyOCw3 IEBAIHByaXZhdGU6CiAgICAgICAgIG5vcm1hbGl6ZWRTdHJpbmcuZXh0cmFjdChtX25vcm1hbGl6 ZWRCdWZmZXIuZ2V0KCksIG5vcm1hbGl6ZWRTdHJpbmcubGVuZ3RoKCkgKyAxLCBlcnJvcik7CiAg ICAgICAgIEFTU0VSVChVX1NVQ0NFU1MoZXJyb3IpKTsKIAotICAgICAgICBmb3IgKHVuc2lnbmVk IGkgPSAwOyBpIDwgbm9ybWFsaXplZFN0cmluZy5sZW5ndGgoKTsgKytpKSB7CisgICAgICAgIGZv ciAoaW50IGkgPSAwOyBpIDwgbm9ybWFsaXplZFN0cmluZy5sZW5ndGgoKTsgKytpKSB7CiAgICAg ICAgICAgICBpZiAoRm9udDo6dHJlYXRBc1NwYWNlKG1fbm9ybWFsaXplZEJ1ZmZlcltpXSkpCiAg ICAgICAgICAgICAgICAgbV9ub3JtYWxpemVkQnVmZmVyW2ldID0gJyAnOwogICAgICAgICB9CkBA IC01MTcsNyArNTE3LDcgQEAgcHJpdmF0ZToKICAgICAgICAgLy8gZ2x5cGguCiAgICAgICAgIHVu c2lnbmVkIGxvZ0NsdXN0ZXJzSW5kZXggPSBpc1JUTCA/IG1faXRlbS5udW1fZ2x5cGhzIC0gMSA6 IDA7CiAKLSAgICAgICAgZm9yIChpbnQgaXRlciA9IDA7IGl0ZXIgPCBtX2l0ZW0ubnVtX2dseXBo czsgKytpdGVyKSB7CisgICAgICAgIGZvciAodW5zaWduZWQgaXRlciA9IDA7IGl0ZXIgPCBtX2l0 ZW0ubnVtX2dseXBoczsgKytpdGVyKSB7CiAgICAgICAgICAgICAvLyBHbHlwaHMgYXJlIHN0b3Jl ZCBpbiBsb2dpY2FsIG9yZGVyLCBidXQgZm9yIGxheW91dCBwdXJwb3NlcyB3ZQogICAgICAgICAg ICAgLy8gYWx3YXlzIGdvIGxlZnQgdG8gcmlnaHQuCiAgICAgICAgICAgICBpbnQgaSA9IGlzUlRM ID8gbV9pdGVtLm51bV9nbHlwaHMgLSBpdGVyIC0gMSA6IGl0ZXI7CkBAIC02ODMsNyArNjgzLDcg QEAgc3RhdGljIGludCBnbHlwaEluZGV4Rm9yWFBvc2l0aW9uSW5TY3JpcHRSdW4oY29uc3QgVGV4 dFJ1bldhbGtlciYgd2Fsa2VyLCBpbnQgeCkKICAgICAgICAgICAgIHggLT0gdHJ1bmNhdGVGaXhl ZFBvaW50VG9JbnRlZ2VyKGFkdmFuY2VzW2dseXBoSW5kZXhdKTsKICAgICAgICAgfQogICAgIH0g ZWxzZSB7Ci0gICAgICAgIGZvciAoZ2x5cGhJbmRleCA9IDA7IGdseXBoSW5kZXggPCB3YWxrZXIu bGVuZ3RoKCk7ICsrZ2x5cGhJbmRleCkgeworICAgICAgICBmb3IgKGdseXBoSW5kZXggPSAwOyBz dGF0aWNfY2FzdDx1bnNpZ25lZD4oZ2x5cGhJbmRleCkgPCB3YWxrZXIubGVuZ3RoKCk7ICsrZ2x5 cGhJbmRleCkgewogICAgICAgICAgICAgaWYgKHggPCB0cnVuY2F0ZUZpeGVkUG9pbnRUb0ludGVn ZXIoYWR2YW5jZXNbZ2x5cGhJbmRleF0pKQogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICAgICAgeCAtPSB0cnVuY2F0ZUZpeGVkUG9pbnRUb0ludGVnZXIoYWR2YW5jZXNbZ2x5cGhJbmRl eF0pOwpAQCAtNzQxLDcgKzc0MSw3IEBAIGludCBGb250OjpvZmZzZXRGb3JQb3NpdGlvbkZvckNv bXBsZXhUZXh0KGNvbnN0IFRleHRSdW4mIHJ1biwgZmxvYXQgeEZsb2F0LAogICAgICAgICBpZiAo d2Fsa2VyLnJ0bCgpKQogICAgICAgICAgICAgYmFzZVBvc2l0aW9uIC09IHdhbGtlci5udW1Db2Rl UG9pbnRzKCk7CiAKLSAgICAgICAgaWYgKHggPj0gMCAmJiB4IDwgd2Fsa2VyLndpZHRoKCkpIHsK KyAgICAgICAgaWYgKHggPj0gMCAmJiBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oeCkgPCB3YWxrZXIu d2lkdGgoKSkgewogICAgICAgICAgICAgLy8gVGhlIHggdmFsdWUgaW4gcXVlc3Rpb24gaXMgd2l0 aGluIHRoaXMgc2NyaXB0IHJ1bi4gV2UgY29uc2lkZXIKICAgICAgICAgICAgIC8vIGVhY2ggZ2x5 cGggaW4gcHJlc2VudGF0aW9uIG9yZGVyIGFuZCBzdG9wIHdoZW4gd2UgZmluZCB0aGUgb25lCiAg ICAgICAgICAgICAvLyBjb3ZlcmluZyB0aGlzIHBvc2l0aW9uLgpAQCAtODAzLDcgKzgwMyw3IEBA IEZsb2F0UmVjdCBGb250OjpzZWxlY3Rpb25SZWN0Rm9yQ29tcGxleFRleHQoY29uc3QgVGV4dFJ1 biYgcnVuLAogICAgICAgICBpZiAod2Fsa2VyLnJ0bCgpKQogICAgICAgICAgICAgYmFzZSAtPSB3 YWxrZXIud2lkdGgoKTsKIAotICAgICAgICBpZiAoZnJvbVggPT0gLTEgJiYgZnJvbSA8IHdhbGtl ci5udW1Db2RlUG9pbnRzKCkpIHsKKyAgICAgICAgaWYgKGZyb21YID09IC0xICYmIGZyb20gPj0g MCAmJiBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oZnJvbSkgPCB3YWxrZXIubnVtQ29kZVBvaW50cygp KSB7CiAgICAgICAgICAgICAvLyB8ZnJvbXwgaXMgd2l0aGluIHRoaXMgc2NyaXB0IHJ1bi4gU28g d2UgaW5kZXggdGhlIGNsdXN0ZXJzIGxvZyB0bwogICAgICAgICAgICAgLy8gZmluZCB3aGljaCBn bHlwaCB0aGlzIGNvZGUtcG9pbnQgY29udHJpYnV0ZWQgdG8gYW5kIGZpbmQgaXRzIHgKICAgICAg ICAgICAgIC8vIHBvc2l0aW9uLgpAQCAtODEzLDcgKzgxMyw3IEBAIEZsb2F0UmVjdCBGb250Ojpz ZWxlY3Rpb25SZWN0Rm9yQ29tcGxleFRleHQoY29uc3QgVGV4dFJ1biYgcnVuLAogICAgICAgICB9 IGVsc2UKICAgICAgICAgICAgIGZyb20gLT0gd2Fsa2VyLm51bUNvZGVQb2ludHMoKTsKIAotICAg ICAgICBpZiAodG9YID09IC0xICYmIHRvIDwgd2Fsa2VyLm51bUNvZGVQb2ludHMoKSkgeworICAg ICAgICBpZiAodG9YID09IC0xICYmIHRvID49IDAgJiYgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHRv KSA8IHdhbGtlci5udW1Db2RlUG9pbnRzKCkpIHsKICAgICAgICAgICAgIGludCBnbHlwaCA9IHdh bGtlci5sb2dDbHVzdGVycygpW3RvXTsKICAgICAgICAgICAgIHRvWCA9IGJhc2UgKyB3YWxrZXIu eFBvc2l0aW9ucygpW2dseXBoXTsKICAgICAgICAgICAgIHRvQWR2YW5jZSA9IHdhbGtlci5hZHZh bmNlcygpW2dseXBoXTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hy b21pdW0vSGFyZmJ1enpTa2lhLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vSGFyZmJ1enpTa2lhLmNwcAppbmRleCA1OWU4MTIyNTI5Y2M4YzM3Njc3NjkwNTg2NTUzZmE5 MWY3ZjAxZDU0Li4wNTZkOGViOGNiM2I5MTBmMDBiNDE1MmMzYTVlMTQ1NjNiZTQ1MjUwIDEwMDY0 NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0hhcmZidXp6U2tpYS5j cHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9IYXJmYnV6elNraWEu Y3BwCkBAIC0xNTAsNyArMTUwLDcgQEAgc3RhdGljIEhCX0Vycm9yIGdldE91dGxpbmVQb2ludChI Ql9Gb250IGhiRm9udCwgSEJfR2x5cGggZ2x5cGgsIGludCBmbGFncywgaGJfdWkKICAgICBTa1Bh dGggcGF0aDsKICAgICBwYWludC5nZXRUZXh0UGF0aCgmZ2x5cGgxNiwgc2l6ZW9mKGdseXBoMTYp LCAwLCAwLCAmcGF0aCk7CiAgICAgaW50IG51bVBvaW50cyA9IHBhdGguZ2V0UG9pbnRzKDAsIDAp OwotICAgIGlmIChwb2ludCA+PSBudW1Qb2ludHMpCisgICAgaWYgKHBvaW50ID49IHN0YXRpY19j YXN0PHVuc2lnbmVkPihudW1Qb2ludHMpKQogICAgICAgICByZXR1cm4gSEJfRXJyX0ludmFsaWRf U3ViVGFibGU7CiAgICAgU2tQb2ludCogcG9pbnRzID0gcmVpbnRlcnByZXRfY2FzdDxTa1BvaW50 Kj4oZmFzdE1hbGxvYyhzaXplb2YoU2tQb2ludCkgKiAocG9pbnQgKyAxKSkpOwogICAgIGlmICgh cG9pbnRzKQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9M YXllclJlbmRlcmVyQ2hyb21pdW0uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9MYXllclJlbmRlcmVyQ2hyb21pdW0uY3BwCmluZGV4IDAzYzhkN2IwNzFkOWQwNjc2M2Q5 ZjZmY2Q2NTVmYmNiOTQ4ODI5ODYuLjY2Y2IwZjc1OTFiZWFkYmM0OTg1MjZmZjliYmRiYzcxOWNl ZTU1ZTIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF5 ZXJSZW5kZXJlckNocm9taXVtLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0xheWVyUmVuZGVyZXJDaHJvbWl1bS5jcHAKQEAgLTI1OCw5ICsyNTgsNyBAQCB2b2lk IExheWVyUmVuZGVyZXJDaHJvbWl1bTo6dXBkYXRlUm9vdExheWVyVGV4dHVyZVJlY3QoY29uc3Qg SW50UmVjdCYgdXBkYXRlUmVjdAogI2lmIFBMQVRGT1JNKFNLSUEpCiAgICAgLy8gR2V0IHRoZSBj b250ZW50cyBvZiB0aGUgdXBkYXRlZCByZWN0LgogICAgIGNvbnN0IFNrQml0bWFwIGJpdG1hcCA9 IG1fcm9vdExheWVyQ2FudmFzLT5nZXREZXZpY2UoKS0+YWNjZXNzQml0bWFwKGZhbHNlKTsKLSAg ICBpbnQgYml0bWFwV2lkdGggPSBiaXRtYXAud2lkdGgoKTsKLSAgICBpbnQgYml0bWFwSGVpZ2h0 ID0gYml0bWFwLmhlaWdodCgpOwotICAgIEFTU0VSVChiaXRtYXBXaWR0aCA9PSB1cGRhdGVSZWN0 LndpZHRoKCkgJiYgYml0bWFwSGVpZ2h0ID09IHVwZGF0ZVJlY3QuaGVpZ2h0KCkpOworICAgIEFT U0VSVChiaXRtYXAud2lkdGgoKSA9PSB1cGRhdGVSZWN0LndpZHRoKCkgJiYgYml0bWFwLmhlaWdo dCgpID09IHVwZGF0ZVJlY3QuaGVpZ2h0KCkpOwogICAgIHZvaWQqIHBpeGVscyA9IGJpdG1hcC5n ZXRQaXhlbHMoKTsKICNlbGlmIFBMQVRGT1JNKENHKQogICAgIC8vIEdldCB0aGUgY29udGVudHMg b2YgdGhlIHVwZGF0ZWQgcmVjdC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3B1L1RleHR1cmUuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvVGV4dHVy ZS5jcHAKaW5kZXggOTU0MzZiYThjNWYyYmUyY2U1ZmVjNjc1Yzc4MzA0YzQxODViMzFiYS4uNjAy M2ZlOTQ5NTZlNzBkZGRhMzg3NjhlYThjZmQ5NGM1N2YyNDRhMiAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvVGV4dHVyZS5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9ncHUvVGV4dHVyZS5jcHAKQEAgLTEyOSw3ICsxMjksNyBAQCBzdGF0aWMgdWlu dDMyX3QqIGNvcHlTdWJSZWN0KHVpbnQzMl90KiBzcmMsIGludCBzcmNYLCBpbnQgc3JjWSwgdWlu dDMyX3QqIGRzdCwgaQogICAgICAgICBmb3IgKGludCB5ID0gMDsgeSA8IGhlaWdodDsgKyt5KSB7 CiAgICAgICAgICAgICBmb3IgKGludCB4ID0gMDsgeCA8IHdpZHRoIDsgKyt4KSB7CiAgICAgICAg ICAgICAgICAgdWludDMyX3QgcGl4ZWwgPSBzcmNPZmZzZXRbeCArIHkgKiBzcmNTdHJpZGVdOwot ICAgICAgICAgICAgICAgICpkc3RQaXhlbCA9IHBpeGVsICYgMHhGRjAwRkYwMCB8ICgocGl4ZWwg JiAweDAwRkYwMDAwKSA+PiAxNikgfCAoKHBpeGVsICYgMHgwMDAwMDBGRikgPDwgMTYpOworICAg ICAgICAgICAgICAgICpkc3RQaXhlbCA9IChwaXhlbCAmIDB4RkYwMEZGMDApIHwgKChwaXhlbCAm IDB4MDBGRjAwMDApID4+IDE2KSB8ICgocGl4ZWwgJiAweDAwMDAwMEZGKSA8PCAxNik7CiAgICAg ICAgICAgICAgICAgZHN0UGl4ZWwrKzsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEu Y3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEu Y3BwCmluZGV4IGNjYWVmYmE4YmM2MTU3OGJiMzk3ZTk1Y2E0NjMxYWUwZWYxNGM3YTIuLmI0Njkz MTJmYTA5OGY2YjU4Y2NkNWE4ZDhjZDRjZmZkMTRhMWVjMmYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNwcAorKysgYi9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5jcHAKQEAgLTg0 NSw3ICs4NDUsNyBAQCB2b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnJlYWRiYWNrSGFyZHdhcmVU b1NvZnR3YXJlKCkgY29uc3QKICAgICAgICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgd2lkdGg7 ICsraSkgewogICAgICAgICAgICAgICAgIHVpbnQzMl90IHBpeGVsID0gcGl4ZWxzW2ldOwogICAg ICAgICAgICAgICAgIC8vIFN3aXp6bGVzIGZyb20gUkdCQSAtPiBCR1JBLgotICAgICAgICAgICAg ICAgIHBpeGVsc1tpXSA9IHBpeGVsICYgMHhGRjAwRkYwMCB8ICgocGl4ZWwgJiAweDAwRkYwMDAw KSA+PiAxNikgfCAoKHBpeGVsICYgMHgwMDAwMDBGRikgPDwgMTYpOworICAgICAgICAgICAgICAg IHBpeGVsc1tpXSA9IChwaXhlbCAmIDB4RkYwMEZGMDApIHwgKChwaXhlbCAmIDB4MDBGRjAwMDAp ID4+IDE2KSB8ICgocGl4ZWwgJiAweDAwMDAwMEZGKSA8PCAxNik7CiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29k ZXJzL2dpZi9HSUZJbWFnZURlY29kZXIuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNv ZGVycy9naWYvR0lGSW1hZ2VEZWNvZGVyLmNwcAppbmRleCAzNmE3YmQ3YTM5MzVlNjZjM2I0OGI3 ODgwMDk3NjgwZGE5NThmYTFjLi40Nzk3NDk1ZjU1Y2U1NjZhNjQ0OWM5YmYyYzg1NDMxZmM1YmVm ZTE5IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2dpZi9HSUZJ bWFnZURlY29kZXIuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvZ2lm L0dJRkltYWdlRGVjb2Rlci5jcHAKQEAgLTYwLDcgKzYwLDcgQEAgYm9vbCBHSUZJbWFnZURlY29k ZXI6OmlzU2l6ZUF2YWlsYWJsZSgpCiAgICAgcmV0dXJuIEltYWdlRGVjb2Rlcjo6aXNTaXplQXZh aWxhYmxlKCk7CiB9CiAKLWJvb2wgR0lGSW1hZ2VEZWNvZGVyOjpzZXRTaXplKHVuc2lnbmVkIHdp ZHRoLCB1bnNpZ25lZCBoZWlnaHQpCitib29sIEdJRkltYWdlRGVjb2Rlcjo6c2V0U2l6ZShpbnQg d2lkdGgsIGludCBoZWlnaHQpCiB7CiAgICAgaWYgKEltYWdlRGVjb2Rlcjo6aXNTaXplQXZhaWxh YmxlKCkgJiYgc2l6ZSgpLndpZHRoKCkgPT0gd2lkdGggJiYgc2l6ZSgpLmhlaWdodCgpID09IGhl aWdodCkKICAgICAgICAgcmV0dXJuIHRydWU7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3Jt L2ltYWdlLWRlY29kZXJzL2dpZi9HSUZJbWFnZURlY29kZXIuaCBiL1dlYkNvcmUvcGxhdGZvcm0v aW1hZ2UtZGVjb2RlcnMvZ2lmL0dJRkltYWdlRGVjb2Rlci5oCmluZGV4IDIxYzFjNTdiYTFlNzI4 MzE5Y2Q0MWNlZGIyMjM4YWRmMTVmYWI0YWEuLjBhODhmZmRkMjNlZGZmYjI5YWI3ZWM2ZGVlNmZk NDFkZjk2N2Q3MjkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMv Z2lmL0dJRkltYWdlRGVjb2Rlci5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2Rl cnMvZ2lmL0dJRkltYWdlRGVjb2Rlci5oCkBAIC00NSw3ICs0NSw3IEBAIG5hbWVzcGFjZSBXZWJD b3JlIHsKICAgICAgICAgdmlydHVhbCBTdHJpbmcgZmlsZW5hbWVFeHRlbnNpb24oKSBjb25zdCB7 IHJldHVybiAiZ2lmIjsgfQogICAgICAgICB2aXJ0dWFsIHZvaWQgc2V0RGF0YShTaGFyZWRCdWZm ZXIqIGRhdGEsIGJvb2wgYWxsRGF0YVJlY2VpdmVkKTsKICAgICAgICAgdmlydHVhbCBib29sIGlz U2l6ZUF2YWlsYWJsZSgpOwotICAgICAgICB2aXJ0dWFsIGJvb2wgc2V0U2l6ZSh1bnNpZ25lZCB3 aWR0aCwgdW5zaWduZWQgaGVpZ2h0KTsKKyAgICAgICAgdmlydHVhbCBib29sIHNldFNpemUoaW50 IHdpZHRoLCBpbnQgaGVpZ2h0KTsKICAgICAgICAgdmlydHVhbCBzaXplX3QgZnJhbWVDb3VudCgp OwogICAgICAgICB2aXJ0dWFsIGludCByZXBldGl0aW9uQ291bnQoKSBjb25zdDsKICAgICAgICAg dmlydHVhbCBSR0JBMzJCdWZmZXIqIGZyYW1lQnVmZmVyQXRJbmRleChzaXplX3QgaW5kZXgpOwo=