67589 2011-09-05 01:11:49 -0700 [chromium skia] JPEGImageEncoder: hoist constants out of the encoding loop 2011-09-07 05:02:56 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 67618 67402 1 noel.gordon noel.gordon abarth hbono jbauman kbr senorblanco webkit.review.bot oldest_to_newest 462067 0 noel.gordon 2011-09-05 01:11:49 -0700 Change the row converter function signatures to be identical, call them via a function pointer from the encoding loop. 462071 1 106314 noel.gordon 2011-09-05 01:32:16 -0700 Created attachment 106314 Patch 462233 2 106314 webkit.review.bot 2011-09-05 12:55:10 -0700 Comment on attachment 106314 Patch Clearing flags on attachment: 106314 Committed r94537: <http://trac.webkit.org/changeset/94537> 462234 3 webkit.review.bot 2011-09-05 12:55:14 -0700 All reviewed patches have been landed. Closing bug. 462260 4 abarth 2011-09-05 14:04:36 -0700 See the Bug 67618 for the compile error. 462263 5 noel.gordon 2011-09-05 14:29:18 -0700 Thankyou. Skia is being compiled into mac chrome, hmmm ... 462264 6 106359 noel.gordon 2011-09-05 14:30:22 -0700 Created attachment 106359 Patch fix Mac Chrome compile. Not a work yet, will compile on the mac once there. 462325 7 106376 noel.gordon 2011-09-05 19:40:40 -0700 Created attachment 106376 Patch for landing. Chrome mac release+debug compile & test fine for me. 462742 8 106376 kbr 2011-09-06 12:32:23 -0700 Comment on attachment 106376 Patch for landing. Looks OK. Let's try again. 462761 9 106376 webkit.review.bot 2011-09-06 12:49:25 -0700 Comment on attachment 106376 Patch for landing. Clearing flags on attachment: 106376 Committed r94591: <http://trac.webkit.org/changeset/94591> 462762 10 webkit.review.bot 2011-09-06 12:49:31 -0700 All reviewed patches have been landed. Closing bug. 106314 2011-09-05 01:32:16 -0700 2011-09-05 14:30:22 -0700 Patch hoist-constants.git.diff text/plain 6363 noel.gordon ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzZjUyNTJlLi4zMGM2MGJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTEtMDktMDUgIE5vZWwgR29yZG9uICA8bm9lbC5nb3Jkb25AZ21haWwuY29tPgorCisg ICAgICAgIFtjaHJvbWl1bSBza2lhXSBKUEVHSW1hZ2VFbmNvZGVyOiBob2lzdCBjb250YW50cyBv dXQgb2YgdGhlIGVuY29kaW5nIGxvb3AKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTY3NTg5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQ2hhbmdlIHRoZSByb3cgY29udmVydGVyIGZ1bmN0aW9uIHNpZ25hdHVy ZXMgdG8gYmUgdGhlIHNhbWUuICBDYWxsIHRoZW0gdmlhIGEgZnVuY3Rpb24KKyAgICAgICAgcG9p bnRlciBkdXJpbmcgdGhlIGVuY29kaW5nIGxvb3AuICBNaW5vciB3ZWJraXQgc3RseWUgY2xlYW51 cCwgcmVtb3ZlIHVudXNlZCBpbmNsdWRlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gIENvdmVy ZWQgYnkgZXhpc3RpbmcgY2FudmFzIDJkIGFuZCAzZCB0ZXN0cy4KKyAgICAgICAgY2FudmFzL3Bo aWxpcC90ZXN0cy90b0RhdGFVUkwuanBlZy5hbHBoYS5odG1sCisgICAgICAgIGZhc3QvY2FudmFz L3dlYmdsL3ByZW11bHRpcGx5YWxwaGEtdGVzdC5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9p bWFnZS1lbmNvZGVycy9za2lhL0pQRUdJbWFnZUVuY29kZXIuY3BwOiAgUmVtb3ZlIFNrVW5QcmVN dWx0aXBseS5oIChub3QgdXNlZCkuCisgICAgICAgIChXZWJDb3JlOjpwcmVNdWx0aXBsaWVkQkdS QXRvUkdCKTogIFVzZSB1bnNpZ25lZCBjaGFyKiBpbnN0ZWFkIG9mIHZvaWQqIGZvciBwaXhlbHMu CisgICAgICAgIChXZWJDb3JlOjpSR0JBdG9SR0IpOiAgcGl4ZWxzICYgcGl4ZWxDb3VudCB0byBt YXRjaCB0aGUgcHJlTXVsdGlwbGllZEJHUkF0b1JHQigpIHNpZ25hdHVyZS4KKyAgICAgICAgKFdl YkNvcmU6OmVuY29kZVBpeGVscyk6ICBNb3ZlIGNvbnRhbnRzIG91dCBvZiB0aGUgZW5jb2Rpbmcg bG9vcDogdXNlIGEgZnVuY3Rpb24gcG9pbnRlciB0bworICAgICAgICBjYWxsIHByZU11bHRpcGxp ZWRCR1JBdG9SR0Igb3IgUkdCQXRvUkdCIChub3cgdGhleSBoYXZlIGlkZW50aWNhbCBzaWduYXR1 cmVzKSBkdXJpbmcgdGhlCisgICAgICAgIGltYWdlIHJvdyBlbmNvZGluZyBsb29wLiAgQWRkL3Vz ZSBwaXhlbFJvd1N0cmlkZSBjb25zdGFudC4KKyAgICAgICAgKFdlYkNvcmU6OkpQRUdJbWFnZUVu Y29kZXI6OmVuY29kZSk6ICB3ZWJraXQgc3R5bGU6IG5vIG5lZWQgdG8gc3BsaXQgbGluZXMuCisK IDIwMTEtMDktMDQgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMTAwNzEyNTY+IFJldGFpbiByZXRpcmVkIGN1c3RvbSBmb250cyB1bnRp bCB0aGUgbmV4dCBzdHlsZSByZWNhbGMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2ltYWdlLWVuY29kZXJzL3NraWEvSlBFR0ltYWdlRW5jb2Rlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9pbWFnZS1lbmNvZGVycy9za2lhL0pQRUdJbWFnZUVuY29kZXIuY3BwCmlu ZGV4IGYwYWM2MDEuLjM5NjQ5MDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2ltYWdlLWVuY29kZXJzL3NraWEvSlBFR0ltYWdlRW5jb2Rlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW1hZ2UtZW5jb2RlcnMvc2tpYS9KUEVHSW1hZ2VFbmNvZGVyLmNwcApA QCAtMzUsNyArMzUsNiBAQAogI2luY2x1ZGUgIkludFNpemUuaCIKICNpbmNsdWRlICJTa0JpdG1h cC5oIgogI2luY2x1ZGUgIlNrQ29sb3JQcml2LmgiCi0jaW5jbHVkZSAiU2tVblByZU11bHRpcGx5 LmgiCiBleHRlcm4gIkMiIHsKICNpbmNsdWRlIDxzdGRpby5oPiAvLyBqcGVnbGliLmggbmVlZHMg c3RkaW8uaCBGSUxFCiAjaW5jbHVkZSAianBlZ2xpYi5oIgpAQCAtODAsOSArNzksOSBAQCBzdGF0 aWMgdm9pZCBoYW5kbGVFcnJvcihqX2NvbW1vbl9wdHIgY29tbW9uKQogICAgIGxvbmdqbXAoKmp1 bXBCdWZmZXJQdHIsIC0xKTsKIH0KIAotc3RhdGljIHZvaWQgcHJlTXVsdGlwbGllZEJHUkF0b1JH Qihjb25zdCB2b2lkKiBwaXhlbHMsIHVuc2lnbmVkIGludCBwaXhlbENvdW50LCB1bnNpZ25lZCBj aGFyKiBvdXRwdXQpCitzdGF0aWMgdm9pZCBwcmVNdWx0aXBsaWVkQkdSQXRvUkdCKGNvbnN0IHVu c2lnbmVkIGNoYXIqIHBpeGVscywgdW5zaWduZWQgaW50IHBpeGVsQ291bnQsIHVuc2lnbmVkIGNo YXIqIG91dHB1dCkKIHsKLSAgICBjb25zdCBTa1BNQ29sb3IqIGlucHV0ID0gc3RhdGljX2Nhc3Q8 Y29uc3QgU2tQTUNvbG9yKj4ocGl4ZWxzKTsKKyAgICBjb25zdCBTa1BNQ29sb3IqIGlucHV0ID0g cmVpbnRlcnByZXRfY2FzdDxjb25zdCBTa1BNQ29sb3IqPihwaXhlbHMpOwogICAgIGZvciAoOyBw aXhlbENvdW50LS0gPiAwOyArK2lucHV0KSB7CiAgICAgICAgICpvdXRwdXQrKyA9IFNrR2V0UGFj a2VkUjMyKCppbnB1dCk7CiAgICAgICAgICpvdXRwdXQrKyA9IFNrR2V0UGFja2VkRzMyKCppbnB1 dCk7CkBAIC05MCwyMCArODksMTcgQEAgc3RhdGljIHZvaWQgcHJlTXVsdGlwbGllZEJHUkF0b1JH Qihjb25zdCB2b2lkKiBwaXhlbHMsIHVuc2lnbmVkIGludCBwaXhlbENvdW50LAogICAgIH0KIH0K IAotc3RhdGljIHZvaWQgUkdCQXRvUkdCKGNvbnN0IHVuc2lnbmVkIGNoYXIqIGlucHV0LCB1bnNp Z25lZCBpbnQgcGl4ZWxzLCB1bnNpZ25lZCBjaGFyKiBvdXRwdXQpCitzdGF0aWMgdm9pZCBSR0JB dG9SR0IoY29uc3QgdW5zaWduZWQgY2hhciogcGl4ZWxzLCB1bnNpZ25lZCBpbnQgcGl4ZWxDb3Vu dCwgdW5zaWduZWQgY2hhciogb3V0cHV0KQogewotICAgIGZvciAoOyBwaXhlbHMtLSA+IDA7IGlu cHV0ICs9IDQpIHsKLSAgICAgICAgKm91dHB1dCsrID0gaW5wdXRbMF07Ci0gICAgICAgICpvdXRw dXQrKyA9IGlucHV0WzFdOwotICAgICAgICAqb3V0cHV0KysgPSBpbnB1dFsyXTsKKyAgICBmb3Ig KDsgcGl4ZWxDb3VudC0tID4gMDsgcGl4ZWxzICs9IDQpIHsKKyAgICAgICAgKm91dHB1dCsrID0g cGl4ZWxzWzBdOworICAgICAgICAqb3V0cHV0KysgPSBwaXhlbHNbMV07CisgICAgICAgICpvdXRw dXQrKyA9IHBpeGVsc1syXTsKICAgICB9CiB9CiAKLXN0YXRpYyBib29sIGVuY29kZVBpeGVscyhj b25zdCBJbnRTaXplJiBpbnB1dFNpemUsIHVuc2lnbmVkIGNoYXIqIGlucHV0UGl4ZWxzLAotICAg ICAgICAgICAgICAgICAgICAgICAgIGJvb2wgcHJlbXVsdGlwbGllZCwgaW50IHF1YWxpdHksIFZl Y3Rvcjx1bnNpZ25lZCBjaGFyPiogb3V0cHV0KQorc3RhdGljIGJvb2wgZW5jb2RlUGl4ZWxzKElu dFNpemUgaW1hZ2VTaXplLCB1bnNpZ25lZCBjaGFyKiBwaXhlbHMsIGJvb2wgcHJlbXVsdGlwbGll ZCwgaW50IHF1YWxpdHksIFZlY3Rvcjx1bnNpZ25lZCBjaGFyPiogb3V0cHV0KQogewotICAgIElu dFNpemUgaW1hZ2VTaXplKGlucHV0U2l6ZSk7Ci0gICAgaW1hZ2VTaXplLmNsYW1wTmVnYXRpdmVU b1plcm8oKTsKICAgICBKUEVHT3V0cHV0QnVmZmVyIGRlc3RpbmF0aW9uOwogICAgIGRlc3RpbmF0 aW9uLm91dHB1dCA9IG91dHB1dDsKICAgICBWZWN0b3I8SlNBTVBMRT4gcm93OwpAQCAtMTI1LDI0 ICsxMjEsMjggQEAgc3RhdGljIGJvb2wgZW5jb2RlUGl4ZWxzKGNvbnN0IEludFNpemUmIGlucHV0 U2l6ZSwgdW5zaWduZWQgY2hhciogaW5wdXRQaXhlbHMsCiAgICAgY2luZm8uZGVzdC0+aW5pdF9k ZXN0aW5hdGlvbiA9IHByZXBhcmVPdXRwdXQ7CiAgICAgY2luZm8uZGVzdC0+ZW1wdHlfb3V0cHV0 X2J1ZmZlciA9IHdyaXRlT3V0cHV0OwogICAgIGNpbmZvLmRlc3QtPnRlcm1fZGVzdGluYXRpb24g PSBmaW5pc2hPdXRwdXQ7CisKKyAgICBpbWFnZVNpemUuY2xhbXBOZWdhdGl2ZVRvWmVybygpOwog ICAgIGNpbmZvLmltYWdlX2hlaWdodCA9IGltYWdlU2l6ZS5oZWlnaHQoKTsKICAgICBjaW5mby5p bWFnZV93aWR0aCA9IGltYWdlU2l6ZS53aWR0aCgpOwogICAgIGNpbmZvLmluX2NvbG9yX3NwYWNl ID0gSkNTX1JHQjsKICAgICBjaW5mby5pbnB1dF9jb21wb25lbnRzID0gMzsKIAorICAgIHZvaWQg KCpleHRyYWN0Um93UkdCKShjb25zdCB1bnNpZ25lZCBjaGFyKiwgdW5zaWduZWQgaW50LCB1bnNp Z25lZCBjaGFyKiBvdXRwdXQpOworICAgIGV4dHJhY3RSb3dSR0IgPSAmUkdCQXRvUkdCOworICAg IGlmIChwcmVtdWx0aXBsaWVkKQorICAgICAgZXh0cmFjdFJvd1JHQiA9ICZwcmVNdWx0aXBsaWVk QkdSQXRvUkdCOworCiAgICAganBlZ19zZXRfZGVmYXVsdHMoJmNpbmZvKTsKICAgICBqcGVnX3Nl dF9xdWFsaXR5KCZjaW5mbywgcXVhbGl0eSwgVFJVRSk7CiAgICAganBlZ19zdGFydF9jb21wcmVz cygmY2luZm8sIFRSVUUpOwogCi0gICAgdW5zaWduZWQgY2hhciogcGl4ZWxzID0gaW5wdXRQaXhl bHM7CiAgICAgcm93LnJlc2l6ZShjaW5mby5pbWFnZV93aWR0aCAqIGNpbmZvLmlucHV0X2NvbXBv bmVudHMpOworICAgIGNvbnN0IHNpemVfdCBwaXhlbFJvd1N0cmlkZSA9IGNpbmZvLmltYWdlX3dp ZHRoICogNDsKICAgICB3aGlsZSAoY2luZm8ubmV4dF9zY2FubGluZSA8IGNpbmZvLmltYWdlX2hl aWdodCkgewotICAgICAgICBpZiAocHJlbXVsdGlwbGllZCkKLSAgICAgICAgICAgIHByZU11bHRp cGxpZWRCR1JBdG9SR0IocGl4ZWxzLCBjaW5mby5pbWFnZV93aWR0aCwgcm93LmRhdGEoKSk7Ci0g ICAgICAgIGVsc2UgCi0gICAgICAgICAgICBSR0JBdG9SR0IocGl4ZWxzLCBjaW5mby5pbWFnZV93 aWR0aCwgcm93LmRhdGEoKSk7CisgICAgICAgIGV4dHJhY3RSb3dSR0IocGl4ZWxzLCBjaW5mby5p bWFnZV93aWR0aCwgcm93LmRhdGEoKSk7CiAgICAgICAgIGpwZWdfd3JpdGVfc2NhbmxpbmVzKCZj aW5mbywgcm93LmRhdGFTbG90KCksIDEpOwotICAgICAgICBwaXhlbHMgKz0gY2luZm8uaW1hZ2Vf d2lkdGggKiA0OworICAgICAgICBwaXhlbHMgKz0gcGl4ZWxSb3dTdHJpZGU7CiAgICAgfQogCiAg ICAganBlZ19maW5pc2hfY29tcHJlc3MoJmNpbmZvKTsKQEAgLTE1MiwyMCArMTUyLDE3IEBAIHN0 YXRpYyBib29sIGVuY29kZVBpeGVscyhjb25zdCBJbnRTaXplJiBpbnB1dFNpemUsIHVuc2lnbmVk IGNoYXIqIGlucHV0UGl4ZWxzLAogCiBib29sIEpQRUdJbWFnZUVuY29kZXI6OmVuY29kZShjb25z dCBTa0JpdG1hcCYgYml0bWFwLCBpbnQgcXVhbGl0eSwgVmVjdG9yPHVuc2lnbmVkIGNoYXI+KiBv dXRwdXQpCiB7Ci0gICAgaWYgKGJpdG1hcC5jb25maWcoKSAhPSBTa0JpdG1hcDo6a0FSR0JfODg4 OF9Db25maWcpCi0gICAgICAgIHJldHVybiBmYWxzZTsgLy8gT25seSBzdXBwb3J0IEFSR0IgMzIg YnBwIHNraWEgYml0bWFwcy4KLQogICAgIFNrQXV0b0xvY2tQaXhlbHMgYml0bWFwTG9jayhiaXRt YXApOwotICAgIEludFNpemUgaW1hZ2VTaXplKGJpdG1hcC53aWR0aCgpLCBiaXRtYXAuaGVpZ2h0 KCkpOwogCi0gICAgcmV0dXJuIGVuY29kZVBpeGVscyhpbWFnZVNpemUsIHN0YXRpY19jYXN0PHVu c2lnbmVkIGNoYXIgKj4oYml0bWFwLmdldFBpeGVscygpKSwKLSAgICAgICAgICAgICAgICAgICAg ICAgIHRydWUsIHF1YWxpdHksIG91dHB1dCk7CisgICAgaWYgKGJpdG1hcC5jb25maWcoKSAhPSBT a0JpdG1hcDo6a0FSR0JfODg4OF9Db25maWcpCisgICAgICAgIHJldHVybiBmYWxzZTsgLy8gT25s eSBzdXBwb3J0IDMyIGJpdC9waXhlbCBza2lhIGJpdG1hcHMuCisKKyAgICByZXR1cm4gZW5jb2Rl UGl4ZWxzKEludFNpemUoYml0bWFwLndpZHRoKCksIGJpdG1hcC5oZWlnaHQoKSksIHN0YXRpY19j YXN0PHVuc2lnbmVkIGNoYXIgKj4oYml0bWFwLmdldFBpeGVscygpKSwgdHJ1ZSwgcXVhbGl0eSwg b3V0cHV0KTsKIH0KIAogYm9vbCBKUEVHSW1hZ2VFbmNvZGVyOjplbmNvZGUoY29uc3QgSW1hZ2VE YXRhJiBpbWFnZURhdGEsIGludCBxdWFsaXR5LCBWZWN0b3I8dW5zaWduZWQgY2hhcj4qIG91dHB1 dCkKIHsKLSAgICByZXR1cm4gZW5jb2RlUGl4ZWxzKGltYWdlRGF0YS5zaXplKCksIGltYWdlRGF0 YS5kYXRhKCktPmRhdGEoKS0+ZGF0YSgpLAotICAgICAgICAgICAgICAgICAgICAgICAgZmFsc2Us IHF1YWxpdHksIG91dHB1dCk7CisgICAgcmV0dXJuIGVuY29kZVBpeGVscyhpbWFnZURhdGEuc2l6 ZSgpLCBpbWFnZURhdGEuZGF0YSgpLT5kYXRhKCktPmRhdGEoKSwgZmFsc2UsIHF1YWxpdHksIG91 dHB1dCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 106359 2011-09-05 14:30:22 -0700 2011-09-05 19:40:40 -0700 Patch fix Mac Chrome compile. 67589.git.diff text/plain 6373 noel.gordon ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4ZWNiM2U4Li41NDdmNzU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTEtMDktMDUgIE5vZWwgR29yZG9uICA8bm9lbC5nb3Jkb25AZ21haWwuY29tPgorCisg ICAgICAgIFtjaHJvbWl1bSBza2lhXSBKUEVHSW1hZ2VFbmNvZGVyOiBob2lzdCBjb25zdGFudHMg b3V0IG9mIHRoZSBlbmNvZGluZyBsb29wCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02NzU4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIENoYW5nZSB0aGUgcm93IGNvbnZlcnRlciBmdW5jdGlvbiBzaWduYXR1 cmVzIHRvIGJlIHRoZSBzYW1lLiAgQ2FsbCB0aGVtIHZpYSBhIGZ1bmN0aW9uCisgICAgICAgIHBv aW50ZXIgZHVyaW5nIHRoZSBlbmNvZGluZyBsb29wLiAgTWlub3Igd2Via2l0IHN0bHllIGNsZWFu dXAsIHJlbW92ZSB1bnVzZWQgaW5jbHVkZS4KKworICAgICAgICBObyBuZXcgdGVzdHMuICBDb3Zl cmVkIGJ5IGV4aXN0aW5nIGNhbnZhcyAyZCBhbmQgM2QgdGVzdHMuCisgICAgICAgIGNhbnZhcy9w aGlsaXAvdGVzdHMvdG9EYXRhVVJMLmpwZWcuYWxwaGEuaHRtbAorICAgICAgICBmYXN0L2NhbnZh cy93ZWJnbC9wcmVtdWx0aXBseWFscGhhLXRlc3QuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0v aW1hZ2UtZW5jb2RlcnMvc2tpYS9KUEVHSW1hZ2VFbmNvZGVyLmNwcDogIFJlbW92ZSBTa1VuUHJl TXVsdGlwbHkuaCAobm90IHVzZWQpLgorICAgICAgICAoV2ViQ29yZTo6cHJlTXVsdGlwbGllZEJH UkF0b1JHQik6ICBVc2UgdW5zaWduZWQgY2hhciogaW5zdGVhZCBvZiB2b2lkKiBmb3IgcGl4ZWxz LgorICAgICAgICAoV2ViQ29yZTo6UkdCQXRvUkdCKTogIHBpeGVscyAmIHBpeGVsQ291bnQgdG8g bWF0Y2ggdGhlIHByZU11bHRpcGxpZWRCR1JBdG9SR0IoKSBzaWduYXR1cmUuCisgICAgICAgIChX ZWJDb3JlOjplbmNvZGVQaXhlbHMpOiAgTW92ZSBjb25zdGFudHMgb3V0IG9mIHRoZSBlbmNvZGlu ZyBsb29wOiB1c2UgYSBmdW5jdGlvbiBwb2ludGVyCisgICAgICAgIHRvIGNhbGwgcHJlTXVsdGlw bGllZEJHUkF0b1JHQiBvciBSR0JBdG9SR0IgKG5vdyB0aGV5IGhhdmUgaWRlbnRpY2FsIHNpZ25h dHVyZXMpIGR1cmluZworICAgICAgICB0aGUgaW1hZ2Ugcm93IGVuY29kaW5nIGxvb3AuICBBZGQv dXNlIHBpeGVsUm93U3RyaWRlIGNvbnN0YW50LgorICAgICAgICAoV2ViQ29yZTo6SlBFR0ltYWdl RW5jb2Rlcjo6ZW5jb2RlKTogIHdlYmtpdCBzdHlsZTogbm8gbmVlZCB0byBzcGxpdCBsaW5lcy4K KwogMjAxMS0wOS0wNSAgS2F1c3R1YmggQXRyYXdhbGthciAgPGthdXN0dWJoQG1vdG9yb2xhLmNv bT4KIAogICAgICAgICBMb2dpYyBmcm9tIEhUTUxFbGVtZW50OjpkZXByZWNhdGVkQ3JlYXRlQ29u dGV4dHVhbEZyYWdtZW50IG1vdmVkIGludG8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2ltYWdlLWVuY29kZXJzL3NraWEvSlBFR0ltYWdlRW5jb2Rlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1lbmNvZGVycy9za2lhL0pQRUdJbWFnZUVuY29kZXIuY3Bw CmluZGV4IGYwYWM2MDEuLjlmZDY5NzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2ltYWdlLWVuY29kZXJzL3NraWEvSlBFR0ltYWdlRW5jb2Rlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZW5jb2RlcnMvc2tpYS9KUEVHSW1hZ2VFbmNvZGVyLmNw cApAQCAtMzUsNyArMzUsNiBAQAogI2luY2x1ZGUgIkludFNpemUuaCIKICNpbmNsdWRlICJTa0Jp dG1hcC5oIgogI2luY2x1ZGUgIlNrQ29sb3JQcml2LmgiCi0jaW5jbHVkZSAiU2tVblByZU11bHRp cGx5LmgiCiBleHRlcm4gIkMiIHsKICNpbmNsdWRlIDxzdGRpby5oPiAvLyBqcGVnbGliLmggbmVl ZHMgc3RkaW8uaCBGSUxFCiAjaW5jbHVkZSAianBlZ2xpYi5oIgpAQCAtODAsOSArNzksOSBAQCBz dGF0aWMgdm9pZCBoYW5kbGVFcnJvcihqX2NvbW1vbl9wdHIgY29tbW9uKQogICAgIGxvbmdqbXAo Kmp1bXBCdWZmZXJQdHIsIC0xKTsKIH0KIAotc3RhdGljIHZvaWQgcHJlTXVsdGlwbGllZEJHUkF0 b1JHQihjb25zdCB2b2lkKiBwaXhlbHMsIHVuc2lnbmVkIGludCBwaXhlbENvdW50LCB1bnNpZ25l ZCBjaGFyKiBvdXRwdXQpCitzdGF0aWMgdm9pZCBwcmVNdWx0aXBsaWVkQkdSQXRvUkdCKGNvbnN0 IHVuc2lnbmVkIGNoYXIqIHBpeGVscywgdW5zaWduZWQgaW50IHBpeGVsQ291bnQsIHVuc2lnbmVk IGNoYXIqIG91dHB1dCkKIHsKLSAgICBjb25zdCBTa1BNQ29sb3IqIGlucHV0ID0gc3RhdGljX2Nh c3Q8Y29uc3QgU2tQTUNvbG9yKj4ocGl4ZWxzKTsKKyAgICBjb25zdCBTa1BNQ29sb3IqIGlucHV0 ID0gcmVpbnRlcnByZXRfY2FzdDxjb25zdCBTa1BNQ29sb3IqPihwaXhlbHMpOwogICAgIGZvciAo OyBwaXhlbENvdW50LS0gPiAwOyArK2lucHV0KSB7CiAgICAgICAgICpvdXRwdXQrKyA9IFNrR2V0 UGFja2VkUjMyKCppbnB1dCk7CiAgICAgICAgICpvdXRwdXQrKyA9IFNrR2V0UGFja2VkRzMyKCpp bnB1dCk7CkBAIC05MCwyMCArODksMTcgQEAgc3RhdGljIHZvaWQgcHJlTXVsdGlwbGllZEJHUkF0 b1JHQihjb25zdCB2b2lkKiBwaXhlbHMsIHVuc2lnbmVkIGludCBwaXhlbENvdW50LAogICAgIH0K IH0KIAotc3RhdGljIHZvaWQgUkdCQXRvUkdCKGNvbnN0IHVuc2lnbmVkIGNoYXIqIGlucHV0LCB1 bnNpZ25lZCBpbnQgcGl4ZWxzLCB1bnNpZ25lZCBjaGFyKiBvdXRwdXQpCitzdGF0aWMgdm9pZCBS R0JBdG9SR0IoY29uc3QgdW5zaWduZWQgY2hhciogcGl4ZWxzLCB1bnNpZ25lZCBpbnQgcGl4ZWxD b3VudCwgdW5zaWduZWQgY2hhciogb3V0cHV0KQogewotICAgIGZvciAoOyBwaXhlbHMtLSA+IDA7 IGlucHV0ICs9IDQpIHsKLSAgICAgICAgKm91dHB1dCsrID0gaW5wdXRbMF07Ci0gICAgICAgICpv dXRwdXQrKyA9IGlucHV0WzFdOwotICAgICAgICAqb3V0cHV0KysgPSBpbnB1dFsyXTsKKyAgICBm b3IgKDsgcGl4ZWxDb3VudC0tID4gMDsgcGl4ZWxzICs9IDQpIHsKKyAgICAgICAgKm91dHB1dCsr ID0gcGl4ZWxzWzBdOworICAgICAgICAqb3V0cHV0KysgPSBwaXhlbHNbMV07CisgICAgICAgICpv dXRwdXQrKyA9IHBpeGVsc1syXTsKICAgICB9CiB9CiAKLXN0YXRpYyBib29sIGVuY29kZVBpeGVs cyhjb25zdCBJbnRTaXplJiBpbnB1dFNpemUsIHVuc2lnbmVkIGNoYXIqIGlucHV0UGl4ZWxzLAot ICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgcHJlbXVsdGlwbGllZCwgaW50IHF1YWxpdHks IFZlY3Rvcjx1bnNpZ25lZCBjaGFyPiogb3V0cHV0KQorc3RhdGljIGJvb2wgZW5jb2RlUGl4ZWxz KEludFNpemUgaW1hZ2VTaXplLCB1bnNpZ25lZCBjaGFyKiBpbnB1dFBpeGVscywgYm9vbCBwcmVt dWx0aXBsaWVkLCBpbnQgcXVhbGl0eSwgVmVjdG9yPHVuc2lnbmVkIGNoYXI+KiBvdXRwdXQpCiB7 Ci0gICAgSW50U2l6ZSBpbWFnZVNpemUoaW5wdXRTaXplKTsKLSAgICBpbWFnZVNpemUuY2xhbXBO ZWdhdGl2ZVRvWmVybygpOwogICAgIEpQRUdPdXRwdXRCdWZmZXIgZGVzdGluYXRpb247CiAgICAg ZGVzdGluYXRpb24ub3V0cHV0ID0gb3V0cHV0OwogICAgIFZlY3RvcjxKU0FNUExFPiByb3c7CkBA IC0xMjUsMjQgKzEyMSwyOSBAQCBzdGF0aWMgYm9vbCBlbmNvZGVQaXhlbHMoY29uc3QgSW50U2l6 ZSYgaW5wdXRTaXplLCB1bnNpZ25lZCBjaGFyKiBpbnB1dFBpeGVscywKICAgICBjaW5mby5kZXN0 LT5pbml0X2Rlc3RpbmF0aW9uID0gcHJlcGFyZU91dHB1dDsKICAgICBjaW5mby5kZXN0LT5lbXB0 eV9vdXRwdXRfYnVmZmVyID0gd3JpdGVPdXRwdXQ7CiAgICAgY2luZm8uZGVzdC0+dGVybV9kZXN0 aW5hdGlvbiA9IGZpbmlzaE91dHB1dDsKKworICAgIGltYWdlU2l6ZS5jbGFtcE5lZ2F0aXZlVG9a ZXJvKCk7CiAgICAgY2luZm8uaW1hZ2VfaGVpZ2h0ID0gaW1hZ2VTaXplLmhlaWdodCgpOwogICAg IGNpbmZvLmltYWdlX3dpZHRoID0gaW1hZ2VTaXplLndpZHRoKCk7CiAgICAgY2luZm8uaW5fY29s b3Jfc3BhY2UgPSBKQ1NfUkdCOwogICAgIGNpbmZvLmlucHV0X2NvbXBvbmVudHMgPSAzOwogCisg ICAgdm9pZCAoKmV4dHJhY3RSb3dSR0IpKGNvbnN0IHVuc2lnbmVkIGNoYXIqLCB1bnNpZ25lZCBp bnQsIHVuc2lnbmVkIGNoYXIqIG91dHB1dCk7CisgICAgZXh0cmFjdFJvd1JHQiA9ICZSR0JBdG9S R0I7CisgICAgaWYgKHByZW11bHRpcGxpZWQpCisgICAgICAgIGV4dHJhY3RSb3dSR0IgPSAmcHJl TXVsdGlwbGllZEJHUkF0b1JHQjsKKwogICAgIGpwZWdfc2V0X2RlZmF1bHRzKCZjaW5mbyk7CiAg ICAganBlZ19zZXRfcXVhbGl0eSgmY2luZm8sIHF1YWxpdHksIFRSVUUpOwogICAgIGpwZWdfc3Rh cnRfY29tcHJlc3MoJmNpbmZvLCBUUlVFKTsKIAogICAgIHVuc2lnbmVkIGNoYXIqIHBpeGVscyA9 IGlucHV0UGl4ZWxzOwogICAgIHJvdy5yZXNpemUoY2luZm8uaW1hZ2Vfd2lkdGggKiBjaW5mby5p bnB1dF9jb21wb25lbnRzKTsKKyAgICBjb25zdCBzaXplX3QgcGl4ZWxSb3dTdHJpZGUgPSBjaW5m by5pbWFnZV93aWR0aCAqIDQ7CiAgICAgd2hpbGUgKGNpbmZvLm5leHRfc2NhbmxpbmUgPCBjaW5m by5pbWFnZV9oZWlnaHQpIHsKLSAgICAgICAgaWYgKHByZW11bHRpcGxpZWQpCi0gICAgICAgICAg ICBwcmVNdWx0aXBsaWVkQkdSQXRvUkdCKHBpeGVscywgY2luZm8uaW1hZ2Vfd2lkdGgsIHJvdy5k YXRhKCkpOwotICAgICAgICBlbHNlIAotICAgICAgICAgICAgUkdCQXRvUkdCKHBpeGVscywgY2lu Zm8uaW1hZ2Vfd2lkdGgsIHJvdy5kYXRhKCkpOworICAgICAgICBleHRyYWN0Um93UkdCKHBpeGVs cywgY2luZm8uaW1hZ2Vfd2lkdGgsIHJvdy5kYXRhKCkpOwogICAgICAgICBqcGVnX3dyaXRlX3Nj YW5saW5lcygmY2luZm8sIHJvdy5kYXRhU2xvdCgpLCAxKTsKLSAgICAgICAgcGl4ZWxzICs9IGNp bmZvLmltYWdlX3dpZHRoICogNDsKKyAgICAgICAgcGl4ZWxzICs9IHBpeGVsUm93U3RyaWRlOwog ICAgIH0KIAogICAgIGpwZWdfZmluaXNoX2NvbXByZXNzKCZjaW5mbyk7CkBAIC0xNTIsMjAgKzE1 MywxNyBAQCBzdGF0aWMgYm9vbCBlbmNvZGVQaXhlbHMoY29uc3QgSW50U2l6ZSYgaW5wdXRTaXpl LCB1bnNpZ25lZCBjaGFyKiBpbnB1dFBpeGVscywKIAogYm9vbCBKUEVHSW1hZ2VFbmNvZGVyOjpl bmNvZGUoY29uc3QgU2tCaXRtYXAmIGJpdG1hcCwgaW50IHF1YWxpdHksIFZlY3Rvcjx1bnNpZ25l ZCBjaGFyPiogb3V0cHV0KQogewotICAgIGlmIChiaXRtYXAuY29uZmlnKCkgIT0gU2tCaXRtYXA6 OmtBUkdCXzg4ODhfQ29uZmlnKQotICAgICAgICByZXR1cm4gZmFsc2U7IC8vIE9ubHkgc3VwcG9y dCBBUkdCIDMyIGJwcCBza2lhIGJpdG1hcHMuCi0KICAgICBTa0F1dG9Mb2NrUGl4ZWxzIGJpdG1h cExvY2soYml0bWFwKTsKLSAgICBJbnRTaXplIGltYWdlU2l6ZShiaXRtYXAud2lkdGgoKSwgYml0 bWFwLmhlaWdodCgpKTsKIAotICAgIHJldHVybiBlbmNvZGVQaXhlbHMoaW1hZ2VTaXplLCBzdGF0 aWNfY2FzdDx1bnNpZ25lZCBjaGFyICo+KGJpdG1hcC5nZXRQaXhlbHMoKSksCi0gICAgICAgICAg ICAgICAgICAgICAgICB0cnVlLCBxdWFsaXR5LCBvdXRwdXQpOworICAgIGlmIChiaXRtYXAuY29u ZmlnKCkgIT0gU2tCaXRtYXA6OmtBUkdCXzg4ODhfQ29uZmlnKQorICAgICAgICByZXR1cm4gZmFs c2U7IC8vIE9ubHkgc3VwcG9ydCAzMiBiaXQvcGl4ZWwgc2tpYSBiaXRtYXBzLgorCisgICAgcmV0 dXJuIGVuY29kZVBpeGVscyhJbnRTaXplKGJpdG1hcC53aWR0aCgpLCBiaXRtYXAuaGVpZ2h0KCkp LCBzdGF0aWNfY2FzdDx1bnNpZ25lZCBjaGFyICo+KGJpdG1hcC5nZXRQaXhlbHMoKSksIHRydWUs IHF1YWxpdHksIG91dHB1dCk7CiB9CiAKIGJvb2wgSlBFR0ltYWdlRW5jb2Rlcjo6ZW5jb2RlKGNv bnN0IEltYWdlRGF0YSYgaW1hZ2VEYXRhLCBpbnQgcXVhbGl0eSwgVmVjdG9yPHVuc2lnbmVkIGNo YXI+KiBvdXRwdXQpCiB7Ci0gICAgcmV0dXJuIGVuY29kZVBpeGVscyhpbWFnZURhdGEuc2l6ZSgp LCBpbWFnZURhdGEuZGF0YSgpLT5kYXRhKCktPmRhdGEoKSwKLSAgICAgICAgICAgICAgICAgICAg ICAgIGZhbHNlLCBxdWFsaXR5LCBvdXRwdXQpOworICAgIHJldHVybiBlbmNvZGVQaXhlbHMoaW1h Z2VEYXRhLnNpemUoKSwgaW1hZ2VEYXRhLmRhdGEoKS0+ZGF0YSgpLT5kYXRhKCksIGZhbHNlLCBx dWFsaXR5LCBvdXRwdXQpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 106376 2011-09-05 19:40:40 -0700 2011-09-06 12:49:25 -0700 Patch for landing. 67589.git.diff text/plain 6265 noel.gordon ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiMDdmZTc3Li43YWM0MDJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTEtMDktMDUgIE5vZWwgR29yZG9uICA8bm9lbC5nb3Jkb25AZ21haWwuY29tPgorCisg ICAgICAgIFtjaHJvbWl1bSBza2lhXSBKUEVHSW1hZ2VFbmNvZGVyOiBob2lzdCBjb25zdGFudHMg b3V0IG9mIHRoZSBlbmNvZGluZyBsb29wCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD02NzU4OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIENoYW5nZSB0aGUgcm93IGNvbnZlcnRlciBmdW5jdGlvbiBzaWduYXR1 cmVzIHRvIGJlIHRoZSBzYW1lLiAgQ2FsbCB0aGVtIHZpYSBhIGZ1bmN0aW9uCisgICAgICAgIHBv aW50ZXIgZHVyaW5nIHRoZSBlbmNvZGluZyBsb29wLiAgTWlub3Igd2Via2l0IHN0eWxlIGNsZWFu dXAsIHJlbW92ZSB1bnVzZWQgaW5jbHVkZS4KKworICAgICAgICBObyBuZXcgdGVzdHMuICBDb3Zl cmVkIGJ5IGV4aXN0aW5nIGNhbnZhcyAyZCBhbmQgM2QgdGVzdHMuCisgICAgICAgIGNhbnZhcy9w aGlsaXAvdGVzdHMvdG9EYXRhVVJMLmpwZWcuYWxwaGEuaHRtbAorICAgICAgICBmYXN0L2NhbnZh cy93ZWJnbC9wcmVtdWx0aXBseWFscGhhLXRlc3QuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0v aW1hZ2UtZW5jb2RlcnMvc2tpYS9KUEVHSW1hZ2VFbmNvZGVyLmNwcDogIFJlbW92ZSBTa1VuUHJl TXVsdGlwbHkuaCAobm90IHVzZWQpLgorICAgICAgICAoV2ViQ29yZTo6cHJlTXVsdGlwbGllZEJH UkF0b1JHQik6ICBVc2UgdW5zaWduZWQgY2hhciogaW5zdGVhZCBvZiB2b2lkKiBmb3IgcGl4ZWxz LgorICAgICAgICAoV2ViQ29yZTo6UkdCQXRvUkdCKTogIHBpeGVscyAmIHBpeGVsQ291bnQgdG8g bWF0Y2ggdGhlIHByZU11bHRpcGxpZWRCR1JBdG9SR0IoKSBzaWduYXR1cmUuCisgICAgICAgIChX ZWJDb3JlOjplbmNvZGVQaXhlbHMpOiAgTW92ZSBjb25zdGFudHMgb3V0IG9mIHRoZSBlbmNvZGlu ZyBsb29wOiB1c2UgYSBmdW5jdGlvbiBwb2ludGVyCisgICAgICAgIHRvIGNhbGwgcHJlTXVsdGlw bGllZEJHUkF0b1JHQiBvciBSR0JBdG9SR0IgKG5vdyB0aGV5IGhhdmUgaWRlbnRpY2FsIHNpZ25h dHVyZXMpLCBkZWZpbmUKKyAgICAgICAgYW5kIHVzZSBwaXhlbFJvd1N0cmlkZSBjb25zdGFudC4K KyAgICAgICAgKFdlYkNvcmU6OkpQRUdJbWFnZUVuY29kZXI6OmVuY29kZSk6CisKIDIwMTEtMDkt MDUgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAg IFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI5NDUzNy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2ltYWdlLWVuY29kZXJzL3NraWEvSlBFR0ltYWdlRW5jb2Rlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1lbmNvZGVycy9za2lhL0pQRUdJbWFnZUVuY29k ZXIuY3BwCmluZGV4IGYwYWM2MDEuLjlmZDY5NzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2ltYWdlLWVuY29kZXJzL3NraWEvSlBFR0ltYWdlRW5jb2Rlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZW5jb2RlcnMvc2tpYS9KUEVHSW1hZ2VFbmNv ZGVyLmNwcApAQCAtMzUsNyArMzUsNiBAQAogI2luY2x1ZGUgIkludFNpemUuaCIKICNpbmNsdWRl ICJTa0JpdG1hcC5oIgogI2luY2x1ZGUgIlNrQ29sb3JQcml2LmgiCi0jaW5jbHVkZSAiU2tVblBy ZU11bHRpcGx5LmgiCiBleHRlcm4gIkMiIHsKICNpbmNsdWRlIDxzdGRpby5oPiAvLyBqcGVnbGli LmggbmVlZHMgc3RkaW8uaCBGSUxFCiAjaW5jbHVkZSAianBlZ2xpYi5oIgpAQCAtODAsOSArNzks OSBAQCBzdGF0aWMgdm9pZCBoYW5kbGVFcnJvcihqX2NvbW1vbl9wdHIgY29tbW9uKQogICAgIGxv bmdqbXAoKmp1bXBCdWZmZXJQdHIsIC0xKTsKIH0KIAotc3RhdGljIHZvaWQgcHJlTXVsdGlwbGll ZEJHUkF0b1JHQihjb25zdCB2b2lkKiBwaXhlbHMsIHVuc2lnbmVkIGludCBwaXhlbENvdW50LCB1 bnNpZ25lZCBjaGFyKiBvdXRwdXQpCitzdGF0aWMgdm9pZCBwcmVNdWx0aXBsaWVkQkdSQXRvUkdC KGNvbnN0IHVuc2lnbmVkIGNoYXIqIHBpeGVscywgdW5zaWduZWQgaW50IHBpeGVsQ291bnQsIHVu c2lnbmVkIGNoYXIqIG91dHB1dCkKIHsKLSAgICBjb25zdCBTa1BNQ29sb3IqIGlucHV0ID0gc3Rh dGljX2Nhc3Q8Y29uc3QgU2tQTUNvbG9yKj4ocGl4ZWxzKTsKKyAgICBjb25zdCBTa1BNQ29sb3Iq IGlucHV0ID0gcmVpbnRlcnByZXRfY2FzdDxjb25zdCBTa1BNQ29sb3IqPihwaXhlbHMpOwogICAg IGZvciAoOyBwaXhlbENvdW50LS0gPiAwOyArK2lucHV0KSB7CiAgICAgICAgICpvdXRwdXQrKyA9 IFNrR2V0UGFja2VkUjMyKCppbnB1dCk7CiAgICAgICAgICpvdXRwdXQrKyA9IFNrR2V0UGFja2Vk RzMyKCppbnB1dCk7CkBAIC05MCwyMCArODksMTcgQEAgc3RhdGljIHZvaWQgcHJlTXVsdGlwbGll ZEJHUkF0b1JHQihjb25zdCB2b2lkKiBwaXhlbHMsIHVuc2lnbmVkIGludCBwaXhlbENvdW50LAog ICAgIH0KIH0KIAotc3RhdGljIHZvaWQgUkdCQXRvUkdCKGNvbnN0IHVuc2lnbmVkIGNoYXIqIGlu cHV0LCB1bnNpZ25lZCBpbnQgcGl4ZWxzLCB1bnNpZ25lZCBjaGFyKiBvdXRwdXQpCitzdGF0aWMg dm9pZCBSR0JBdG9SR0IoY29uc3QgdW5zaWduZWQgY2hhciogcGl4ZWxzLCB1bnNpZ25lZCBpbnQg cGl4ZWxDb3VudCwgdW5zaWduZWQgY2hhciogb3V0cHV0KQogewotICAgIGZvciAoOyBwaXhlbHMt LSA+IDA7IGlucHV0ICs9IDQpIHsKLSAgICAgICAgKm91dHB1dCsrID0gaW5wdXRbMF07Ci0gICAg ICAgICpvdXRwdXQrKyA9IGlucHV0WzFdOwotICAgICAgICAqb3V0cHV0KysgPSBpbnB1dFsyXTsK KyAgICBmb3IgKDsgcGl4ZWxDb3VudC0tID4gMDsgcGl4ZWxzICs9IDQpIHsKKyAgICAgICAgKm91 dHB1dCsrID0gcGl4ZWxzWzBdOworICAgICAgICAqb3V0cHV0KysgPSBwaXhlbHNbMV07CisgICAg ICAgICpvdXRwdXQrKyA9IHBpeGVsc1syXTsKICAgICB9CiB9CiAKLXN0YXRpYyBib29sIGVuY29k ZVBpeGVscyhjb25zdCBJbnRTaXplJiBpbnB1dFNpemUsIHVuc2lnbmVkIGNoYXIqIGlucHV0UGl4 ZWxzLAotICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgcHJlbXVsdGlwbGllZCwgaW50IHF1 YWxpdHksIFZlY3Rvcjx1bnNpZ25lZCBjaGFyPiogb3V0cHV0KQorc3RhdGljIGJvb2wgZW5jb2Rl UGl4ZWxzKEludFNpemUgaW1hZ2VTaXplLCB1bnNpZ25lZCBjaGFyKiBpbnB1dFBpeGVscywgYm9v bCBwcmVtdWx0aXBsaWVkLCBpbnQgcXVhbGl0eSwgVmVjdG9yPHVuc2lnbmVkIGNoYXI+KiBvdXRw dXQpCiB7Ci0gICAgSW50U2l6ZSBpbWFnZVNpemUoaW5wdXRTaXplKTsKLSAgICBpbWFnZVNpemUu Y2xhbXBOZWdhdGl2ZVRvWmVybygpOwogICAgIEpQRUdPdXRwdXRCdWZmZXIgZGVzdGluYXRpb247 CiAgICAgZGVzdGluYXRpb24ub3V0cHV0ID0gb3V0cHV0OwogICAgIFZlY3RvcjxKU0FNUExFPiBy b3c7CkBAIC0xMjUsMjQgKzEyMSwyOSBAQCBzdGF0aWMgYm9vbCBlbmNvZGVQaXhlbHMoY29uc3Qg SW50U2l6ZSYgaW5wdXRTaXplLCB1bnNpZ25lZCBjaGFyKiBpbnB1dFBpeGVscywKICAgICBjaW5m by5kZXN0LT5pbml0X2Rlc3RpbmF0aW9uID0gcHJlcGFyZU91dHB1dDsKICAgICBjaW5mby5kZXN0 LT5lbXB0eV9vdXRwdXRfYnVmZmVyID0gd3JpdGVPdXRwdXQ7CiAgICAgY2luZm8uZGVzdC0+dGVy bV9kZXN0aW5hdGlvbiA9IGZpbmlzaE91dHB1dDsKKworICAgIGltYWdlU2l6ZS5jbGFtcE5lZ2F0 aXZlVG9aZXJvKCk7CiAgICAgY2luZm8uaW1hZ2VfaGVpZ2h0ID0gaW1hZ2VTaXplLmhlaWdodCgp OwogICAgIGNpbmZvLmltYWdlX3dpZHRoID0gaW1hZ2VTaXplLndpZHRoKCk7CiAgICAgY2luZm8u aW5fY29sb3Jfc3BhY2UgPSBKQ1NfUkdCOwogICAgIGNpbmZvLmlucHV0X2NvbXBvbmVudHMgPSAz OwogCisgICAgdm9pZCAoKmV4dHJhY3RSb3dSR0IpKGNvbnN0IHVuc2lnbmVkIGNoYXIqLCB1bnNp Z25lZCBpbnQsIHVuc2lnbmVkIGNoYXIqIG91dHB1dCk7CisgICAgZXh0cmFjdFJvd1JHQiA9ICZS R0JBdG9SR0I7CisgICAgaWYgKHByZW11bHRpcGxpZWQpCisgICAgICAgIGV4dHJhY3RSb3dSR0Ig PSAmcHJlTXVsdGlwbGllZEJHUkF0b1JHQjsKKwogICAgIGpwZWdfc2V0X2RlZmF1bHRzKCZjaW5m byk7CiAgICAganBlZ19zZXRfcXVhbGl0eSgmY2luZm8sIHF1YWxpdHksIFRSVUUpOwogICAgIGpw ZWdfc3RhcnRfY29tcHJlc3MoJmNpbmZvLCBUUlVFKTsKIAogICAgIHVuc2lnbmVkIGNoYXIqIHBp eGVscyA9IGlucHV0UGl4ZWxzOwogICAgIHJvdy5yZXNpemUoY2luZm8uaW1hZ2Vfd2lkdGggKiBj aW5mby5pbnB1dF9jb21wb25lbnRzKTsKKyAgICBjb25zdCBzaXplX3QgcGl4ZWxSb3dTdHJpZGUg PSBjaW5mby5pbWFnZV93aWR0aCAqIDQ7CiAgICAgd2hpbGUgKGNpbmZvLm5leHRfc2NhbmxpbmUg PCBjaW5mby5pbWFnZV9oZWlnaHQpIHsKLSAgICAgICAgaWYgKHByZW11bHRpcGxpZWQpCi0gICAg ICAgICAgICBwcmVNdWx0aXBsaWVkQkdSQXRvUkdCKHBpeGVscywgY2luZm8uaW1hZ2Vfd2lkdGgs IHJvdy5kYXRhKCkpOwotICAgICAgICBlbHNlIAotICAgICAgICAgICAgUkdCQXRvUkdCKHBpeGVs cywgY2luZm8uaW1hZ2Vfd2lkdGgsIHJvdy5kYXRhKCkpOworICAgICAgICBleHRyYWN0Um93UkdC KHBpeGVscywgY2luZm8uaW1hZ2Vfd2lkdGgsIHJvdy5kYXRhKCkpOwogICAgICAgICBqcGVnX3dy aXRlX3NjYW5saW5lcygmY2luZm8sIHJvdy5kYXRhU2xvdCgpLCAxKTsKLSAgICAgICAgcGl4ZWxz ICs9IGNpbmZvLmltYWdlX3dpZHRoICogNDsKKyAgICAgICAgcGl4ZWxzICs9IHBpeGVsUm93U3Ry aWRlOwogICAgIH0KIAogICAgIGpwZWdfZmluaXNoX2NvbXByZXNzKCZjaW5mbyk7CkBAIC0xNTIs MjAgKzE1MywxNyBAQCBzdGF0aWMgYm9vbCBlbmNvZGVQaXhlbHMoY29uc3QgSW50U2l6ZSYgaW5w dXRTaXplLCB1bnNpZ25lZCBjaGFyKiBpbnB1dFBpeGVscywKIAogYm9vbCBKUEVHSW1hZ2VFbmNv ZGVyOjplbmNvZGUoY29uc3QgU2tCaXRtYXAmIGJpdG1hcCwgaW50IHF1YWxpdHksIFZlY3Rvcjx1 bnNpZ25lZCBjaGFyPiogb3V0cHV0KQogewotICAgIGlmIChiaXRtYXAuY29uZmlnKCkgIT0gU2tC aXRtYXA6OmtBUkdCXzg4ODhfQ29uZmlnKQotICAgICAgICByZXR1cm4gZmFsc2U7IC8vIE9ubHkg c3VwcG9ydCBBUkdCIDMyIGJwcCBza2lhIGJpdG1hcHMuCi0KICAgICBTa0F1dG9Mb2NrUGl4ZWxz IGJpdG1hcExvY2soYml0bWFwKTsKLSAgICBJbnRTaXplIGltYWdlU2l6ZShiaXRtYXAud2lkdGgo KSwgYml0bWFwLmhlaWdodCgpKTsKIAotICAgIHJldHVybiBlbmNvZGVQaXhlbHMoaW1hZ2VTaXpl LCBzdGF0aWNfY2FzdDx1bnNpZ25lZCBjaGFyICo+KGJpdG1hcC5nZXRQaXhlbHMoKSksCi0gICAg ICAgICAgICAgICAgICAgICAgICB0cnVlLCBxdWFsaXR5LCBvdXRwdXQpOworICAgIGlmIChiaXRt YXAuY29uZmlnKCkgIT0gU2tCaXRtYXA6OmtBUkdCXzg4ODhfQ29uZmlnKQorICAgICAgICByZXR1 cm4gZmFsc2U7IC8vIE9ubHkgc3VwcG9ydCAzMiBiaXQvcGl4ZWwgc2tpYSBiaXRtYXBzLgorCisg ICAgcmV0dXJuIGVuY29kZVBpeGVscyhJbnRTaXplKGJpdG1hcC53aWR0aCgpLCBiaXRtYXAuaGVp Z2h0KCkpLCBzdGF0aWNfY2FzdDx1bnNpZ25lZCBjaGFyICo+KGJpdG1hcC5nZXRQaXhlbHMoKSks IHRydWUsIHF1YWxpdHksIG91dHB1dCk7CiB9CiAKIGJvb2wgSlBFR0ltYWdlRW5jb2Rlcjo6ZW5j b2RlKGNvbnN0IEltYWdlRGF0YSYgaW1hZ2VEYXRhLCBpbnQgcXVhbGl0eSwgVmVjdG9yPHVuc2ln bmVkIGNoYXI+KiBvdXRwdXQpCiB7Ci0gICAgcmV0dXJuIGVuY29kZVBpeGVscyhpbWFnZURhdGEu c2l6ZSgpLCBpbWFnZURhdGEuZGF0YSgpLT5kYXRhKCktPmRhdGEoKSwKLSAgICAgICAgICAgICAg ICAgICAgICAgIGZhbHNlLCBxdWFsaXR5LCBvdXRwdXQpOworICAgIHJldHVybiBlbmNvZGVQaXhl bHMoaW1hZ2VEYXRhLnNpemUoKSwgaW1hZ2VEYXRhLmRhdGEoKS0+ZGF0YSgpLT5kYXRhKCksIGZh bHNlLCBxdWFsaXR5LCBvdXRwdXQpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg==