43902 2010-08-12 02:30:58 -0700 flaky websocket/tests/frame-length-overflow.html 2010-08-13 05:02:22 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 ukai webkit-unassigned ap dglazkov webkit-ews webkit.review.bot oldest_to_newest 263673 0 ukai 2010-08-12 02:30:58 -0700 chrome buildbot shows flaky failures of websocket/tests/frame-length-overflow.html http://test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=websocket%2Ftests%2Fframe-length-overflow.html Actual test looks like: Make sure WebSocket does not crash and report error when it sees length overflow On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". WebSocket is open WebSocket received error frame WebSocket received error frame WebSocket is closed PASS successfullyParsed is true TEST COMPLETE So, it received 2 error event before close. I guess it would happen as follows: processBuffer post error event and leave buffer unchanged. before didClose is called, message loops runs again (more data comes from network or so) and calls processBuffer again (via didReceivedData or resumeTimerFired) it sees the same buffer again and post error event 263676 1 64197 ukai 2010-08-12 02:37:38 -0700 Created attachment 64197 Patch 263679 2 webkit-ews 2010-08-12 02:44:17 -0700 Attachment 64197 did not build on qt: Build output: http://queues.webkit.org/results/3770091 263687 3 64200 ukai 2010-08-12 03:02:37 -0700 Created attachment 64200 Patch 263699 4 webkit.review.bot 2010-08-12 03:23:06 -0700 Attachment 64197 did not build on chromium: Build output: http://queues.webkit.org/results/3740070 263803 5 64200 ap 2010-08-12 07:38:43 -0700 Comment on attachment 64200 Patch > + , m_errorClosed(false) I don't like this name, it sounds as if the error itself were somehow closed. When is this variable set to true? If you can explain it in a full English sentence, that may help come up with a good variable name. > + skipBuffer(m_bufferSize); // Release buffer. We don't read any more data. A comment saying why we're doing this would be more helpful than one saying what we're doing. Is this so save memory? + if (m_errorClosed) + return false; Indentation is incorrect here. 264170 6 ukai 2010-08-12 22:22:05 -0700 (In reply to comment #5) > (From update of attachment 64200 [details]) > > + , m_errorClosed(false) > > I don't like this name, it sounds as if the error itself were somehow closed. When is this variable set to true? If you can explain it in a full English sentence, that may help come up with a good variable name. how about m_readShutdowned. It means the channel won't receive any more data, like SHUT_RD. > > + skipBuffer(m_bufferSize); // Release buffer. We don't read any more data. > > A comment saying why we're doing this would be more helpful than one saying what we're doing. Is this so save memory? Yes. and make sure it doesn't read the same buffer again. > + if (m_errorClosed) > + return false; > > Indentation is incorrect here. 264171 7 64300 ukai 2010-08-12 22:22:23 -0700 Created attachment 64300 Patch 264191 8 ap 2010-08-12 23:10:50 -0700 + , m_readShutdowned(false) Shutdown is not a verb, so this should be "m_readShutDown" for better grammar. > It means the channel won't receive any more data, like SHUT_RD. This sounds like something we should be asking the channel about then, not something to keep in WebSocket object. If it's better to keep this in WebSocket, then the name needs to be different yet, indicating what it means from this code point of view. > Yes. and make sure it doesn't read the same buffer again. Doesn't setting m_errorClosed/m_readShutdowned already prevent that? 264209 9 ukai 2010-08-12 23:55:19 -0700 (In reply to comment #8) > + , m_readShutdowned(false) > > Shutdown is not a verb, so this should be "m_readShutDown" for better grammar. > > > It means the channel won't receive any more data, like SHUT_RD. > > This sounds like something we should be asking the channel about then, not something to keep in WebSocket object. If it's better to keep this in WebSocket, then the name needs to be different yet, indicating what it means from this code point of view. Hmm, how about m_readClosed, or m_shouldDiscardReceivedData ? > > Yes. and make sure it doesn't read the same buffer again. > > Doesn't setting m_errorClosed/m_readShutdowned already prevent that? Ah, yes. 264213 10 ap 2010-08-13 00:07:13 -0700 m_shouldDiscardReceivedData sounds like the best option so far. 264231 11 64310 ukai 2010-08-13 00:59:03 -0700 Created attachment 64310 Patch 264291 12 ukai 2010-08-13 05:02:22 -0700 Committed r65313: <http://trac.webkit.org/changeset/65313> 64197 2010-08-12 02:37:38 -0700 2010-08-12 03:02:32 -0700 Patch bug-43902-20100812023736.patch text/plain 3780 ukai ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MGMxM2ZhMjM1MzMwNGRkNDg1YjAzMGRhNWEzMjVkMDBmMzVmYmFhOC4uNTIxMjFkZDlkNDk4Njhj Nzc5MjI0ZTUxNDZhOGNkY2NkZWU1MmU4MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wOC0xMiAgRnVt aXRvc2hpIFVrYWkgIDx1a2FpQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBmbGFreSB3ZWJzb2NrZXQvdGVzdHMvZnJhbWUtbGVu Z3RoLW92ZXJmbG93Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQzOTAyCisKKyAgICAgICAgQWRkIG1fZXJyb3JDbG9zZWQgZmxhZyB0byBpbmRp Y2F0ZSBpdCB3aWxsIG5vIGxvbmdlciByZWNlaXZlIGRhdGEKKyAgICAgICAgZnJvbSBuZXR3b3Jr LgorCisgICAgICAgICogd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OldlYlNvY2tldENoYW5uZWw6OldlYlNvY2tldENoYW5uZWwpOgorICAgICAgICAo V2ViQ29yZTo6V2ViU29ja2V0Q2hhbm5lbDo6ZGlkUmVjZWl2ZURhdGEpOgorICAgICAgICAtIGlm IG1fZXJyb3JDbG9zZWQgaXMgdHJ1ZSwgaXQgbm8gbG9uZ2VyIHJlY2VpdmVzIGRhdGEuCisgICAg ICAgIChXZWJDb3JlOjpXZWJTb2NrZXRDaGFubmVsOjpkaWRGYWlsKToKKyAgICAgICAgKFdlYkNv cmU6OldlYlNvY2tldENoYW5uZWw6OnByb2Nlc3NCdWZmZXIpOgorICAgICAgICAtIHdoZW4gZnJh bWUgbGVuZ3RoIG92ZXJmbG93cywgd2UgY291bGRuJ3QgcHJvY2VzcyBkYXRhIGFueSBtb3JlLgor ICAgICAgICAgIGNsZWFyIGJ1ZmZlciBhbmQgbWFyayBtX2Vycm9yQ2xvc2VkIHRydWUuCisgICAg ICAgICogd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmg6CisKIDIwMTAtMDgtMTIgIEFsZWph bmRybyBHLiBDYXN0cm8gIDxhbGV4QGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RGF2aWQgTGV2aW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hh bm5lbC5jcHAgYi9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHAKaW5kZXgg NDc3MzFjZmM4MWU0NjZkNTZhMjY5YmI0ZjE5NDY0ZTJjZjVhMTk4Zi4uZTVlZDkxM2NlMzc5YmJk YjkzMzRiZDRlZDA3ZDJkZGYzOGMzNjkzMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS93ZWJzb2NrZXRz L1dlYlNvY2tldENoYW5uZWwuY3BwCisrKyBiL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRD aGFubmVsLmNwcApAQCAtNjEsNiArNjEsNyBAQCBXZWJTb2NrZXRDaGFubmVsOjpXZWJTb2NrZXRD aGFubmVsKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIFdlYlNvY2tldENoYQogICAg ICwgbV9yZXN1bWVUaW1lcih0aGlzLCAmV2ViU29ja2V0Q2hhbm5lbDo6cmVzdW1lVGltZXJGaXJl ZCkKICAgICAsIG1fc3VzcGVuZGVkKGZhbHNlKQogICAgICwgbV9jbG9zZWQoZmFsc2UpCisgICAg LCBtX2Vycm9yQ2xvc2VkKGZhbHNlKQogICAgICwgbV91bmhhbmRsZWRCdWZmZXJlZEFtb3VudCgw KQogewogfQpAQCAtMTcxLDEwICsxNzIsMTQgQEAgdm9pZCBXZWJTb2NrZXRDaGFubmVsOjpkaWRS ZWNlaXZlRGF0YShTb2NrZXRTdHJlYW1IYW5kbGUqIGhhbmRsZSwgY29uc3QgY2hhciogZGEKICAg ICAgICAgcmV0dXJuOwogICAgIH0KICAgICBpZiAoIW1fY2xpZW50KSB7CisgICAgICAgIG1fZXJy b3JDbG9zZWQgPSB0cnVlOwogICAgICAgICBoYW5kbGUtPmNsb3NlKCk7CiAgICAgICAgIHJldHVy bjsKICAgICB9CisgICAgaWYgKG1fZXJyb3JDbG9zZWQpCisgICAgICAgIHJldHVybjsKICAgICBp ZiAoIWFwcGVuZFRvQnVmZmVyKGRhdGEsIGxlbikpIHsKKyAgICAgICAgbV9lcnJvckNsb3NlZCA9 IHRydWU7CiAgICAgICAgIGhhbmRsZS0+Y2xvc2UoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K QEAgLTE4Nyw2ICsxOTIsNyBAQCB2b2lkIFdlYlNvY2tldENoYW5uZWw6OmRpZEZhaWwoU29ja2V0 U3RyZWFtSGFuZGxlKiBoYW5kbGUsIGNvbnN0IFNvY2tldFN0cmVhbUVycgogewogICAgIExPRyhO ZXR3b3JrLCAiV2ViU29ja2V0Q2hhbm5lbCAlcCBkaWRGYWlsIiwgdGhpcyk7CiAgICAgQVNTRVJU KGhhbmRsZSA9PSBtX2hhbmRsZSB8fCAhbV9oYW5kbGUpOworICAgIG1fZXJyb3JDbG9zZWQgPSB0 cnVlOwogICAgIGhhbmRsZS0+Y2xvc2UoKTsKIH0KIApAQCAtMjM2LDYgKzI0Miw4IEBAIGJvb2wg V2ViU29ja2V0Q2hhbm5lbDo6cHJvY2Vzc0J1ZmZlcigpCiAgICAgQVNTRVJUKCFtX3N1c3BlbmRl ZCk7CiAgICAgQVNTRVJUKG1fY2xpZW50KTsKICAgICBBU1NFUlQobV9idWZmZXIpOworICAgIGlm IChtX2Vycm9yQ2xvc2VkKQorICAgICAgcmV0dXJuOwogCiAgICAgaWYgKG1faGFuZHNoYWtlLm1v ZGUoKSA9PSBXZWJTb2NrZXRIYW5kc2hha2U6OkluY29tcGxldGUpIHsKICAgICAgICAgaW50IGhl YWRlckxlbmd0aCA9IG1faGFuZHNoYWtlLnJlYWRTZXJ2ZXJIYW5kc2hha2UobV9idWZmZXIsIG1f YnVmZmVyU2l6ZSk7CkBAIC0yNjAsNiArMjY4LDcgQEAgYm9vbCBXZWJTb2NrZXRDaGFubmVsOjpw cm9jZXNzQnVmZmVyKCkKICAgICAgICAgfQogICAgICAgICBMT0coTmV0d29yaywgIldlYlNvY2tl dENoYW5uZWwgJXAgY29ubmVjdGlvbiBmYWlsZWQiLCB0aGlzKTsKICAgICAgICAgc2tpcEJ1ZmZl cihoZWFkZXJMZW5ndGgpOworICAgICAgICBtX2Vycm9yQ2xvc2VkID0gdHJ1ZTsKICAgICAgICAg aWYgKCFtX2Nsb3NlZCkKICAgICAgICAgICAgIG1faGFuZGxlLT5jbG9zZSgpOwogICAgICAgICBy ZXR1cm4gZmFsc2U7CkBAIC0zMDUsNiArMzE0LDggQEAgYm9vbCBXZWJTb2NrZXRDaGFubmVsOjpw cm9jZXNzQnVmZmVyKCkKICAgICAgICAgICAgIGVycm9yRnJhbWUgPSB0cnVlOwogICAgICAgICB9 CiAgICAgICAgIGlmIChlcnJvckZyYW1lKSB7CisgICAgICAgICAgICBza2lwQnVmZmVyKG1fYnVm ZmVyU2l6ZSk7IC8vIFJlbGVhc2UgYnVmZmVyLiBXZSBkb24ndCByZWFkIGFueSBtb3JlIGRhdGEu CisgICAgICAgICAgICBtX2Vycm9yQ2xvc2VkID0gdHJ1ZTsKICAgICAgICAgICAgIG1fY2xpZW50 LT5kaWRSZWNlaXZlTWVzc2FnZUVycm9yKCk7CiAgICAgICAgICAgICBpZiAoIW1fY2xpZW50KQog ICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvd2Vic29j a2V0cy9XZWJTb2NrZXRDaGFubmVsLmggYi9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hh bm5lbC5oCmluZGV4IDA2YmU1MGU0YzM5NWVmNDJmYTc3YWI5YzRkMzZmYjZiZTJjYzE2MzYuLjNm MDdjNGM1MDdiN2E4YWRjMTFhMjQzNjM4ZmFiYTQ1NTgwYTRlZDUgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmgKKysrIGIvV2ViQ29yZS93ZWJzb2NrZXRz L1dlYlNvY2tldENoYW5uZWwuaApAQCAtOTQsNiArOTQsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAgICAgICAgIFRpbWVyPFdlYlNvY2tldENoYW5uZWw+IG1fcmVzdW1lVGltZXI7CiAgICAgICAg IGJvb2wgbV9zdXNwZW5kZWQ7CiAgICAgICAgIGJvb2wgbV9jbG9zZWQ7CisgICAgICAgIGJvb2wg bV9lcnJvckNsb3NlZDsKICAgICAgICAgdW5zaWduZWQgbG9uZyBtX3VuaGFuZGxlZEJ1ZmZlcmVk QW1vdW50OwogICAgIH07CiAK 64200 2010-08-12 03:02:37 -0700 2010-08-12 22:22:17 -0700 Patch bug-43902-20100812030235.patch text/plain 3786 ukai ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MGMxM2ZhMjM1MzMwNGRkNDg1YjAzMGRhNWEzMjVkMDBmMzVmYmFhOC4uNTIxMjFkZDlkNDk4Njhj Nzc5MjI0ZTUxNDZhOGNkY2NkZWU1MmU4MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wOC0xMiAgRnVt aXRvc2hpIFVrYWkgIDx1a2FpQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBmbGFreSB3ZWJzb2NrZXQvdGVzdHMvZnJhbWUtbGVu Z3RoLW92ZXJmbG93Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQzOTAyCisKKyAgICAgICAgQWRkIG1fZXJyb3JDbG9zZWQgZmxhZyB0byBpbmRp Y2F0ZSBpdCB3aWxsIG5vIGxvbmdlciByZWNlaXZlIGRhdGEKKyAgICAgICAgZnJvbSBuZXR3b3Jr LgorCisgICAgICAgICogd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OldlYlNvY2tldENoYW5uZWw6OldlYlNvY2tldENoYW5uZWwpOgorICAgICAgICAo V2ViQ29yZTo6V2ViU29ja2V0Q2hhbm5lbDo6ZGlkUmVjZWl2ZURhdGEpOgorICAgICAgICAtIGlm IG1fZXJyb3JDbG9zZWQgaXMgdHJ1ZSwgaXQgbm8gbG9uZ2VyIHJlY2VpdmVzIGRhdGEuCisgICAg ICAgIChXZWJDb3JlOjpXZWJTb2NrZXRDaGFubmVsOjpkaWRGYWlsKToKKyAgICAgICAgKFdlYkNv cmU6OldlYlNvY2tldENoYW5uZWw6OnByb2Nlc3NCdWZmZXIpOgorICAgICAgICAtIHdoZW4gZnJh bWUgbGVuZ3RoIG92ZXJmbG93cywgd2UgY291bGRuJ3QgcHJvY2VzcyBkYXRhIGFueSBtb3JlLgor ICAgICAgICAgIGNsZWFyIGJ1ZmZlciBhbmQgbWFyayBtX2Vycm9yQ2xvc2VkIHRydWUuCisgICAg ICAgICogd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmg6CisKIDIwMTAtMDgtMTIgIEFsZWph bmRybyBHLiBDYXN0cm8gIDxhbGV4QGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RGF2aWQgTGV2aW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hh bm5lbC5jcHAgYi9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHAKaW5kZXgg NDc3MzFjZmM4MWU0NjZkNTZhMjY5YmI0ZjE5NDY0ZTJjZjVhMTk4Zi4uOThiYjQ1NTQyNmMwNGZm NjZiMDhjNmRiMjAwMTM4MGExZTRkZGM5NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS93ZWJzb2NrZXRz L1dlYlNvY2tldENoYW5uZWwuY3BwCisrKyBiL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRD aGFubmVsLmNwcApAQCAtNjEsNiArNjEsNyBAQCBXZWJTb2NrZXRDaGFubmVsOjpXZWJTb2NrZXRD aGFubmVsKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleHQsIFdlYlNvY2tldENoYQogICAg ICwgbV9yZXN1bWVUaW1lcih0aGlzLCAmV2ViU29ja2V0Q2hhbm5lbDo6cmVzdW1lVGltZXJGaXJl ZCkKICAgICAsIG1fc3VzcGVuZGVkKGZhbHNlKQogICAgICwgbV9jbG9zZWQoZmFsc2UpCisgICAg LCBtX2Vycm9yQ2xvc2VkKGZhbHNlKQogICAgICwgbV91bmhhbmRsZWRCdWZmZXJlZEFtb3VudCgw KQogewogfQpAQCAtMTcxLDEwICsxNzIsMTQgQEAgdm9pZCBXZWJTb2NrZXRDaGFubmVsOjpkaWRS ZWNlaXZlRGF0YShTb2NrZXRTdHJlYW1IYW5kbGUqIGhhbmRsZSwgY29uc3QgY2hhciogZGEKICAg ICAgICAgcmV0dXJuOwogICAgIH0KICAgICBpZiAoIW1fY2xpZW50KSB7CisgICAgICAgIG1fZXJy b3JDbG9zZWQgPSB0cnVlOwogICAgICAgICBoYW5kbGUtPmNsb3NlKCk7CiAgICAgICAgIHJldHVy bjsKICAgICB9CisgICAgaWYgKG1fZXJyb3JDbG9zZWQpCisgICAgICAgIHJldHVybjsKICAgICBp ZiAoIWFwcGVuZFRvQnVmZmVyKGRhdGEsIGxlbikpIHsKKyAgICAgICAgbV9lcnJvckNsb3NlZCA9 IHRydWU7CiAgICAgICAgIGhhbmRsZS0+Y2xvc2UoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K QEAgLTE4Nyw2ICsxOTIsNyBAQCB2b2lkIFdlYlNvY2tldENoYW5uZWw6OmRpZEZhaWwoU29ja2V0 U3RyZWFtSGFuZGxlKiBoYW5kbGUsIGNvbnN0IFNvY2tldFN0cmVhbUVycgogewogICAgIExPRyhO ZXR3b3JrLCAiV2ViU29ja2V0Q2hhbm5lbCAlcCBkaWRGYWlsIiwgdGhpcyk7CiAgICAgQVNTRVJU KGhhbmRsZSA9PSBtX2hhbmRsZSB8fCAhbV9oYW5kbGUpOworICAgIG1fZXJyb3JDbG9zZWQgPSB0 cnVlOwogICAgIGhhbmRsZS0+Y2xvc2UoKTsKIH0KIApAQCAtMjM2LDYgKzI0Miw4IEBAIGJvb2wg V2ViU29ja2V0Q2hhbm5lbDo6cHJvY2Vzc0J1ZmZlcigpCiAgICAgQVNTRVJUKCFtX3N1c3BlbmRl ZCk7CiAgICAgQVNTRVJUKG1fY2xpZW50KTsKICAgICBBU1NFUlQobV9idWZmZXIpOworICAgIGlm IChtX2Vycm9yQ2xvc2VkKQorICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKG1faGFuZHNo YWtlLm1vZGUoKSA9PSBXZWJTb2NrZXRIYW5kc2hha2U6OkluY29tcGxldGUpIHsKICAgICAgICAg aW50IGhlYWRlckxlbmd0aCA9IG1faGFuZHNoYWtlLnJlYWRTZXJ2ZXJIYW5kc2hha2UobV9idWZm ZXIsIG1fYnVmZmVyU2l6ZSk7CkBAIC0yNjAsNiArMjY4LDcgQEAgYm9vbCBXZWJTb2NrZXRDaGFu bmVsOjpwcm9jZXNzQnVmZmVyKCkKICAgICAgICAgfQogICAgICAgICBMT0coTmV0d29yaywgIldl YlNvY2tldENoYW5uZWwgJXAgY29ubmVjdGlvbiBmYWlsZWQiLCB0aGlzKTsKICAgICAgICAgc2tp cEJ1ZmZlcihoZWFkZXJMZW5ndGgpOworICAgICAgICBtX2Vycm9yQ2xvc2VkID0gdHJ1ZTsKICAg ICAgICAgaWYgKCFtX2Nsb3NlZCkKICAgICAgICAgICAgIG1faGFuZGxlLT5jbG9zZSgpOwogICAg ICAgICByZXR1cm4gZmFsc2U7CkBAIC0zMDUsNiArMzE0LDggQEAgYm9vbCBXZWJTb2NrZXRDaGFu bmVsOjpwcm9jZXNzQnVmZmVyKCkKICAgICAgICAgICAgIGVycm9yRnJhbWUgPSB0cnVlOwogICAg ICAgICB9CiAgICAgICAgIGlmIChlcnJvckZyYW1lKSB7CisgICAgICAgICAgICBza2lwQnVmZmVy KG1fYnVmZmVyU2l6ZSk7IC8vIFJlbGVhc2UgYnVmZmVyLiBXZSBkb24ndCByZWFkIGFueSBtb3Jl IGRhdGEuCisgICAgICAgICAgICBtX2Vycm9yQ2xvc2VkID0gdHJ1ZTsKICAgICAgICAgICAgIG1f Y2xpZW50LT5kaWRSZWNlaXZlTWVzc2FnZUVycm9yKCk7CiAgICAgICAgICAgICBpZiAoIW1fY2xp ZW50KQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUv d2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmggYi9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29j a2V0Q2hhbm5lbC5oCmluZGV4IDA2YmU1MGU0YzM5NWVmNDJmYTc3YWI5YzRkMzZmYjZiZTJjYzE2 MzYuLjNmMDdjNGM1MDdiN2E4YWRjMTFhMjQzNjM4ZmFiYTQ1NTgwYTRlZDUgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmgKKysrIGIvV2ViQ29yZS93ZWJz b2NrZXRzL1dlYlNvY2tldENoYW5uZWwuaApAQCAtOTQsNiArOTQsNyBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgICAgIFRpbWVyPFdlYlNvY2tldENoYW5uZWw+IG1fcmVzdW1lVGltZXI7CiAg ICAgICAgIGJvb2wgbV9zdXNwZW5kZWQ7CiAgICAgICAgIGJvb2wgbV9jbG9zZWQ7CisgICAgICAg IGJvb2wgbV9lcnJvckNsb3NlZDsKICAgICAgICAgdW5zaWduZWQgbG9uZyBtX3VuaGFuZGxlZEJ1 ZmZlcmVkQW1vdW50OwogICAgIH07CiAK 64300 2010-08-12 22:22:23 -0700 2010-08-13 00:58:58 -0700 Patch bug-43902-20100812222221.patch text/plain 3972 ukai ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NWE2ZGFiMDlhNTM3YjM4MjJjMjA1OGVhMWFiOWYyMDc4ODlhN2MwMi4uOTI3ZjkwZmI0MWMzZTc2 YmQ2M2U5NDc1MjEwYmRlNWM2NjVjMDNkYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMC0wOC0xMiAgRnVt aXRvc2hpIFVrYWkgIDx1a2FpQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBmbGFreSB3ZWJzb2NrZXQvdGVzdHMvZnJhbWUtbGVu Z3RoLW92ZXJmbG93Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQzOTAyCisKKyAgICAgICAgQWRkIG1fcmVhZFNodXRkb3duZWQgZmxhZyB0byBp bmRpY2F0ZSBpdCB3aWxsIG5vIGxvbmdlciByZWNlaXZlIGRhdGEKKyAgICAgICAgZnJvbSBuZXR3 b3JrLgorCisgICAgICAgICogd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OldlYlNvY2tldENoYW5uZWw6OldlYlNvY2tldENoYW5uZWwpOgorICAgICAg ICAoV2ViQ29yZTo6V2ViU29ja2V0Q2hhbm5lbDo6ZGlkUmVjZWl2ZURhdGEpOgorICAgICAgICAt IGlmIG1fcmVhZFNodXRkb3duZWQgaXMgdHJ1ZSwgaXQgbm8gbG9uZ2VyIHJlY2VpdmVzIGRhdGEu CisgICAgICAgIChXZWJDb3JlOjpXZWJTb2NrZXRDaGFubmVsOjpkaWRGYWlsKToKKyAgICAgICAg KFdlYkNvcmU6OldlYlNvY2tldENoYW5uZWw6OnByb2Nlc3NCdWZmZXIpOgorICAgICAgICAtIHdo ZW4gZnJhbWUgbGVuZ3RoIG92ZXJmbG93cywgd2UgY291bGRuJ3QgcHJvY2VzcyBkYXRhIGFueSBt b3JlLgorICAgICAgICAgIGNsZWFyIGJ1ZmZlciBhbmQgbWFyayBtX3JlYWRTaHV0ZG93bmVkIHRy dWUgdG8gbWFrZSBzdXJlIGl0IGRvZXNuJ3QKKyAgICAgICAgICBwcm9jZXNzIHRoZSBzYW1lIGJ1 ZmZlciBhZ2Fpbi4KKyAgICAgICAgKiB3ZWJzb2NrZXRzL1dlYlNvY2tldENoYW5uZWwuaDoKKwog MjAxMC0wOC0xMiAgR2F2aW4gQmFycmFjbG91Z2ggIDxiYXJyYWNsb3VnaEBhcHBsZS5jb20+CiAK ICAgICAgICAgU3BlY3VsYXRpdmUgYnVpbGQgZml4IGZvciBjaHJvbWl1bSBiaW5kaW5ncyAoc29t ZW9uZSBhZGRlZCB0aGUgb2xkIGluY2x1ZGUgc3R5bGUhKS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv d2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmNwcCBiL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJT b2NrZXRDaGFubmVsLmNwcAppbmRleCA0NzczMWNmYzgxZTQ2NmQ1NmEyNjliYjRmMTk0NjRlMmNm NWExOThmLi42NjJkMjYyYzI0OGJiYzBiYjgzNDc0Mzg2ZjRkY2VhZWUzMjViMDA4IDEwMDY0NAot LS0gYS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHAKKysrIGIvV2ViQ29y ZS93ZWJzb2NrZXRzL1dlYlNvY2tldENoYW5uZWwuY3BwCkBAIC02MSw2ICs2MSw3IEBAIFdlYlNv Y2tldENoYW5uZWw6OldlYlNvY2tldENoYW5uZWwoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29u dGV4dCwgV2ViU29ja2V0Q2hhCiAgICAgLCBtX3Jlc3VtZVRpbWVyKHRoaXMsICZXZWJTb2NrZXRD aGFubmVsOjpyZXN1bWVUaW1lckZpcmVkKQogICAgICwgbV9zdXNwZW5kZWQoZmFsc2UpCiAgICAg LCBtX2Nsb3NlZChmYWxzZSkKKyAgICAsIG1fcmVhZFNodXRkb3duZWQoZmFsc2UpCiAgICAgLCBt X3VuaGFuZGxlZEJ1ZmZlcmVkQW1vdW50KDApCiB7CiB9CkBAIC0xNzEsMTAgKzE3MiwxNCBAQCB2 b2lkIFdlYlNvY2tldENoYW5uZWw6OmRpZFJlY2VpdmVEYXRhKFNvY2tldFN0cmVhbUhhbmRsZSog aGFuZGxlLCBjb25zdCBjaGFyKiBkYQogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIGlmICgh bV9jbGllbnQpIHsKKyAgICAgICAgbV9yZWFkU2h1dGRvd25lZCA9IHRydWU7CiAgICAgICAgIGhh bmRsZS0+Y2xvc2UoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KKyAgICBpZiAobV9yZWFkU2h1 dGRvd25lZCkKKyAgICAgICAgcmV0dXJuOwogICAgIGlmICghYXBwZW5kVG9CdWZmZXIoZGF0YSwg bGVuKSkgeworICAgICAgICBtX3JlYWRTaHV0ZG93bmVkID0gdHJ1ZTsKICAgICAgICAgaGFuZGxl LT5jbG9zZSgpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMTg3LDYgKzE5Miw3IEBAIHZv aWQgV2ViU29ja2V0Q2hhbm5lbDo6ZGlkRmFpbChTb2NrZXRTdHJlYW1IYW5kbGUqIGhhbmRsZSwg Y29uc3QgU29ja2V0U3RyZWFtRXJyCiB7CiAgICAgTE9HKE5ldHdvcmssICJXZWJTb2NrZXRDaGFu bmVsICVwIGRpZEZhaWwiLCB0aGlzKTsKICAgICBBU1NFUlQoaGFuZGxlID09IG1faGFuZGxlIHx8 ICFtX2hhbmRsZSk7CisgICAgbV9yZWFkU2h1dGRvd25lZCA9IHRydWU7CiAgICAgaGFuZGxlLT5j bG9zZSgpOwogfQogCkBAIC0yMzYsNiArMjQyLDggQEAgYm9vbCBXZWJTb2NrZXRDaGFubmVsOjpw cm9jZXNzQnVmZmVyKCkKICAgICBBU1NFUlQoIW1fc3VzcGVuZGVkKTsKICAgICBBU1NFUlQobV9j bGllbnQpOwogICAgIEFTU0VSVChtX2J1ZmZlcik7CisgICAgaWYgKG1fcmVhZFNodXRkb3duZWQp CisgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmIChtX2hhbmRzaGFrZS5tb2RlKCkgPT0g V2ViU29ja2V0SGFuZHNoYWtlOjpJbmNvbXBsZXRlKSB7CiAgICAgICAgIGludCBoZWFkZXJMZW5n dGggPSBtX2hhbmRzaGFrZS5yZWFkU2VydmVySGFuZHNoYWtlKG1fYnVmZmVyLCBtX2J1ZmZlclNp emUpOwpAQCAtMjYwLDYgKzI2OCw3IEBAIGJvb2wgV2ViU29ja2V0Q2hhbm5lbDo6cHJvY2Vzc0J1 ZmZlcigpCiAgICAgICAgIH0KICAgICAgICAgTE9HKE5ldHdvcmssICJXZWJTb2NrZXRDaGFubmVs ICVwIGNvbm5lY3Rpb24gZmFpbGVkIiwgdGhpcyk7CiAgICAgICAgIHNraXBCdWZmZXIoaGVhZGVy TGVuZ3RoKTsKKyAgICAgICAgbV9yZWFkU2h1dGRvd25lZCA9IHRydWU7CiAgICAgICAgIGlmICgh bV9jbG9zZWQpCiAgICAgICAgICAgICBtX2hhbmRsZS0+Y2xvc2UoKTsKICAgICAgICAgcmV0dXJu IGZhbHNlOwpAQCAtMzA1LDYgKzMxNCw4IEBAIGJvb2wgV2ViU29ja2V0Q2hhbm5lbDo6cHJvY2Vz c0J1ZmZlcigpCiAgICAgICAgICAgICBlcnJvckZyYW1lID0gdHJ1ZTsKICAgICAgICAgfQogICAg ICAgICBpZiAoZXJyb3JGcmFtZSkgeworICAgICAgICAgICAgc2tpcEJ1ZmZlcihtX2J1ZmZlclNp emUpOyAvLyBTYXZlIG1lbW9yeSBhbmQgbWFrZSBzdXJlIGl0IGRvZXNuJ3QgcmVhZCB0aGUgc2Ft ZSBidWZmZXIgYWdhaW4uCisgICAgICAgICAgICBtX3JlYWRTaHV0ZG93bmVkID0gdHJ1ZTsKICAg ICAgICAgICAgIG1fY2xpZW50LT5kaWRSZWNlaXZlTWVzc2FnZUVycm9yKCk7CiAgICAgICAgICAg ICBpZiAoIW1fY2xpZW50KQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdp dCBhL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmggYi9XZWJDb3JlL3dlYnNv Y2tldHMvV2ViU29ja2V0Q2hhbm5lbC5oCmluZGV4IDA2YmU1MGU0YzM5NWVmNDJmYTc3YWI5YzRk MzZmYjZiZTJjYzE2MzYuLjZiNGYxZmVlZDg3NmM5MGQwM2U3NTMxYzYxOTJiZWZiZDU5OGM1NzYg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmgKKysrIGIv V2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldENoYW5uZWwuaApAQCAtOTQsNiArOTQsNyBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIFRpbWVyPFdlYlNvY2tldENoYW5uZWw+IG1fcmVz dW1lVGltZXI7CiAgICAgICAgIGJvb2wgbV9zdXNwZW5kZWQ7CiAgICAgICAgIGJvb2wgbV9jbG9z ZWQ7CisgICAgICAgIGJvb2wgbV9yZWFkU2h1dGRvd25lZDsKICAgICAgICAgdW5zaWduZWQgbG9u ZyBtX3VuaGFuZGxlZEJ1ZmZlcmVkQW1vdW50OwogICAgIH07CiAK 64310 2010-08-13 00:59:03 -0700 2010-08-13 01:52:26 -0700 Patch bug-43902-20100813005901.patch text/plain 3921 ukai ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZmU1MTdjNWY2MWJjNWI0NTIxN2E2OWU2ZDJlN2ViOWY0YmRmZWY2MC4uNDU1MjhjMjY3NzUzM2Y2 NDY0ODE0YTk0OTNhMjk4MzQzZTFlMGYxYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wOC0xMiAgRnVt aXRvc2hpIFVrYWkgIDx1a2FpQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBmbGFreSB3ZWJzb2NrZXQvdGVzdHMvZnJhbWUtbGVu Z3RoLW92ZXJmbG93Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQzOTAyCisKKyAgICAgICAgQWRkIG1fc2hvdWxkRGlzY2FyZFJlY2VpdmVkRGF0 YSBmbGFnIHRvIGluZGljYXRlIGl0IHdpbGwgbm8gbG9uZ2VyCisgICAgICAgIHJlY2VpdmUgZGF0 YSBmcm9tIG5ldHdvcmsuCisKKyAgICAgICAgKiB3ZWJzb2NrZXRzL1dlYlNvY2tldENoYW5uZWwu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViU29ja2V0Q2hhbm5lbDo6V2ViU29ja2V0Q2hhbm5l bCk6CisgICAgICAgIChXZWJDb3JlOjpXZWJTb2NrZXRDaGFubmVsOjpkaWRSZWNlaXZlRGF0YSk6 CisgICAgICAgIChXZWJDb3JlOjpXZWJTb2NrZXRDaGFubmVsOjpkaWRGYWlsKToKKyAgICAgICAg KFdlYkNvcmU6OldlYlNvY2tldENoYW5uZWw6OnByb2Nlc3NCdWZmZXIpOgorICAgICAgICAtIHdo ZW4gZnJhbWUgbGVuZ3RoIG92ZXJmbG93cywgd2UgY291bGRuJ3QgcHJvY2VzcyBkYXRhIGFueSBt b3JlLgorICAgICAgICAgIGNsZWFyIGJ1ZmZlciBhbmQgbWFyayBtX3Nob3VsZERpc2NhcmRSZWNl aXZlZERhdGEgdHJ1ZSB0byBtYWtlIHN1cmUKKyAgICAgICAgICBpdCBkb2Vzbid0IHByb2Nlc3Mg dGhlIHNhbWUgYnVmZmVyIGFnYWluLgorICAgICAgICAqIHdlYnNvY2tldHMvV2ViU29ja2V0Q2hh bm5lbC5oOgorCiAyMDEwLTA4LTEyICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdt YWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByNjUyOTUuCmRpZmYg LS1naXQgYS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHAgYi9XZWJDb3Jl L3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5jcHAKaW5kZXggNDc3MzFjZmM4MWU0NjZkNTZh MjY5YmI0ZjE5NDY0ZTJjZjVhMTk4Zi4uNTRiZTE2YTQ5NWJlMWE4YzMyMjRjYTM2M2Q2MjdkY2Yz ZGMwY2M5MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS93ZWJzb2NrZXRzL1dlYlNvY2tldENoYW5uZWwu Y3BwCisrKyBiL1dlYkNvcmUvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmNwcApAQCAtNjEs NiArNjEsNyBAQCBXZWJTb2NrZXRDaGFubmVsOjpXZWJTb2NrZXRDaGFubmVsKFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQqIGNvbnRleHQsIFdlYlNvY2tldENoYQogICAgICwgbV9yZXN1bWVUaW1lcih0 aGlzLCAmV2ViU29ja2V0Q2hhbm5lbDo6cmVzdW1lVGltZXJGaXJlZCkKICAgICAsIG1fc3VzcGVu ZGVkKGZhbHNlKQogICAgICwgbV9jbG9zZWQoZmFsc2UpCisgICAgLCBtX3Nob3VsZERpc2NhcmRS ZWNlaXZlZERhdGEoZmFsc2UpCiAgICAgLCBtX3VuaGFuZGxlZEJ1ZmZlcmVkQW1vdW50KDApCiB7 CiB9CkBAIC0xNzEsMTAgKzE3MiwxNCBAQCB2b2lkIFdlYlNvY2tldENoYW5uZWw6OmRpZFJlY2Vp dmVEYXRhKFNvY2tldFN0cmVhbUhhbmRsZSogaGFuZGxlLCBjb25zdCBjaGFyKiBkYQogICAgICAg ICByZXR1cm47CiAgICAgfQogICAgIGlmICghbV9jbGllbnQpIHsKKyAgICAgICAgbV9zaG91bGRE aXNjYXJkUmVjZWl2ZWREYXRhID0gdHJ1ZTsKICAgICAgICAgaGFuZGxlLT5jbG9zZSgpOwogICAg ICAgICByZXR1cm47CiAgICAgfQorICAgIGlmIChtX3Nob3VsZERpc2NhcmRSZWNlaXZlZERhdGEp CisgICAgICAgIHJldHVybjsKICAgICBpZiAoIWFwcGVuZFRvQnVmZmVyKGRhdGEsIGxlbikpIHsK KyAgICAgICAgbV9zaG91bGREaXNjYXJkUmVjZWl2ZWREYXRhID0gdHJ1ZTsKICAgICAgICAgaGFu ZGxlLT5jbG9zZSgpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMTg3LDYgKzE5Miw3IEBA IHZvaWQgV2ViU29ja2V0Q2hhbm5lbDo6ZGlkRmFpbChTb2NrZXRTdHJlYW1IYW5kbGUqIGhhbmRs ZSwgY29uc3QgU29ja2V0U3RyZWFtRXJyCiB7CiAgICAgTE9HKE5ldHdvcmssICJXZWJTb2NrZXRD aGFubmVsICVwIGRpZEZhaWwiLCB0aGlzKTsKICAgICBBU1NFUlQoaGFuZGxlID09IG1faGFuZGxl IHx8ICFtX2hhbmRsZSk7CisgICAgbV9zaG91bGREaXNjYXJkUmVjZWl2ZWREYXRhID0gdHJ1ZTsK ICAgICBoYW5kbGUtPmNsb3NlKCk7CiB9CiAKQEAgLTIzNiw2ICsyNDIsOCBAQCBib29sIFdlYlNv Y2tldENoYW5uZWw6OnByb2Nlc3NCdWZmZXIoKQogICAgIEFTU0VSVCghbV9zdXNwZW5kZWQpOwog ICAgIEFTU0VSVChtX2NsaWVudCk7CiAgICAgQVNTRVJUKG1fYnVmZmVyKTsKKyAgICBpZiAobV9z aG91bGREaXNjYXJkUmVjZWl2ZWREYXRhKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBp ZiAobV9oYW5kc2hha2UubW9kZSgpID09IFdlYlNvY2tldEhhbmRzaGFrZTo6SW5jb21wbGV0ZSkg ewogICAgICAgICBpbnQgaGVhZGVyTGVuZ3RoID0gbV9oYW5kc2hha2UucmVhZFNlcnZlckhhbmRz aGFrZShtX2J1ZmZlciwgbV9idWZmZXJTaXplKTsKQEAgLTI2MCw2ICsyNjgsNyBAQCBib29sIFdl YlNvY2tldENoYW5uZWw6OnByb2Nlc3NCdWZmZXIoKQogICAgICAgICB9CiAgICAgICAgIExPRyhO ZXR3b3JrLCAiV2ViU29ja2V0Q2hhbm5lbCAlcCBjb25uZWN0aW9uIGZhaWxlZCIsIHRoaXMpOwog ICAgICAgICBza2lwQnVmZmVyKGhlYWRlckxlbmd0aCk7CisgICAgICAgIG1fc2hvdWxkRGlzY2Fy ZFJlY2VpdmVkRGF0YSA9IHRydWU7CiAgICAgICAgIGlmICghbV9jbG9zZWQpCiAgICAgICAgICAg ICBtX2hhbmRsZS0+Y2xvc2UoKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMzA1LDYgKzMx NCw4IEBAIGJvb2wgV2ViU29ja2V0Q2hhbm5lbDo6cHJvY2Vzc0J1ZmZlcigpCiAgICAgICAgICAg ICBlcnJvckZyYW1lID0gdHJ1ZTsKICAgICAgICAgfQogICAgICAgICBpZiAoZXJyb3JGcmFtZSkg eworICAgICAgICAgICAgc2tpcEJ1ZmZlcihtX2J1ZmZlclNpemUpOyAvLyBTYXZlIG1lbW9yeS4K KyAgICAgICAgICAgIG1fc2hvdWxkRGlzY2FyZFJlY2VpdmVkRGF0YSA9IHRydWU7CiAgICAgICAg ICAgICBtX2NsaWVudC0+ZGlkUmVjZWl2ZU1lc3NhZ2VFcnJvcigpOwogICAgICAgICAgICAgaWYg KCFtX2NsaWVudCkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CmRpZmYgLS1naXQgYS9X ZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5oIGIvV2ViQ29yZS93ZWJzb2NrZXRz L1dlYlNvY2tldENoYW5uZWwuaAppbmRleCAwNmJlNTBlNGMzOTVlZjQyZmE3N2FiOWM0ZDM2ZmI2 YmUyY2MxNjM2Li40M2Q0MzFhMGY4OTllMDAzMDllNmEzMDU5ZWI2NGMyOThjZTIwMTYzIDEwMDY0 NAotLS0gYS9XZWJDb3JlL3dlYnNvY2tldHMvV2ViU29ja2V0Q2hhbm5lbC5oCisrKyBiL1dlYkNv cmUvd2Vic29ja2V0cy9XZWJTb2NrZXRDaGFubmVsLmgKQEAgLTk0LDYgKzk0LDcgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogICAgICAgICBUaW1lcjxXZWJTb2NrZXRDaGFubmVsPiBtX3Jlc3VtZVRp bWVyOwogICAgICAgICBib29sIG1fc3VzcGVuZGVkOwogICAgICAgICBib29sIG1fY2xvc2VkOwor ICAgICAgICBib29sIG1fc2hvdWxkRGlzY2FyZFJlY2VpdmVkRGF0YTsKICAgICAgICAgdW5zaWdu ZWQgbG9uZyBtX3VuaGFuZGxlZEJ1ZmZlcmVkQW1vdW50OwogICAgIH07CiAK