67875 2011-09-09 16:32:35 -0700 Remove toPrimitive from JSCell 2011-09-19 21:32:23 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 68389 67690 1 mhahnenberg mhahnenberg darin ggaren oliver webkit.review.bot oldest_to_newest 465095 0 mhahnenberg 2011-09-09 16:32:35 -0700 We should remove JSCell::toPrimitive in favor of JSValue::toPrimitive. The JSValue version in non-virtual, and we're trying to remove all virtual methods from JSCell. 465134 1 106945 mhahnenberg 2011-09-09 17:23:39 -0700 Created attachment 106945 Patch 466584 2 106945 mhahnenberg 2011-09-13 15:05:25 -0700 Comment on attachment 106945 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=106945&action=review > Source/JavaScriptCore/ChangeLog:9 > + all of the implicit functionality provided by the virutal toPrimitive method sp > Source/JavaScriptCore/runtime/JSObject.h:911 > + return *const_cast<JSValue*>(this); no const_cast, please > Source/JavaScriptCore/runtime/JSObject.h:912 > + if (isCell()) Test isCell first for efficiency. Create separate toPrimitives for JSCell* and JSObject*. 468733 3 107708 mhahnenberg 2011-09-16 12:56:25 -0700 Created attachment 107708 Patch 469057 4 107708 webkit.review.bot 2011-09-17 02:20:10 -0700 Comment on attachment 107708 Patch Attachment 107708 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/9729359 469202 5 107708 ggaren 2011-09-18 15:44:50 -0700 Comment on attachment 107708 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=107708&action=review > Source/JavaScriptCore/runtime/JSCell.cpp:124 > + if (isString()) > + return ((JSString*)this)->toPrimitive(exec, preferredType); > + return ((JSObject*)this)->toPrimitive(exec, preferredType); Use C++ static_cast, please. It's more explicit, and provides a little more type safety than a C-style cast. Are the bot complaints a real issue? 469561 6 107892 mhahnenberg 2011-09-19 11:28:39 -0700 Created attachment 107892 Patch 469589 7 107892 ggaren 2011-09-19 12:06:35 -0700 Comment on attachment 107892 Patch r=me 469643 8 107892 webkit.review.bot 2011-09-19 13:31:59 -0700 Comment on attachment 107892 Patch Clearing flags on attachment: 107892 Committed r95466: <http://trac.webkit.org/changeset/95466> 469644 9 webkit.review.bot 2011-09-19 13:32:04 -0700 All reviewed patches have been landed. Closing bug. 469675 10 darin 2011-09-19 14:08:38 -0700 Why did this patch move JSValue::toPrimitive from JSCell.h to JSString.h? That change makes no sense to me! 469682 11 mhahnenberg 2011-09-19 14:19:45 -0700 (In reply to comment #10) > Why did this patch move JSValue::toPrimitive from JSCell.h to JSString.h? That change makes no sense to me! Good question. This is the corrected (for compilation) version of an incorrect (for style) version. Rolling it out to resubmit the corrected (for both) version. 469712 12 107922 mhahnenberg 2011-09-19 15:01:42 -0700 Created attachment 107922 Patch 469909 13 107922 webkit.review.bot 2011-09-19 21:32:18 -0700 Comment on attachment 107922 Patch Clearing flags on attachment: 107922 Committed r95516: <http://trac.webkit.org/changeset/95516> 469910 14 webkit.review.bot 2011-09-19 21:32:23 -0700 All reviewed patches have been landed. Closing bug. 106945 2011-09-09 17:23:39 -0700 2011-09-16 12:56:16 -0700 Patch bug-67875-20110909172336.patch text/plain 10837 mhahnenberg U3VidmVyc2lvbiBSZXZpc2lvbjogOTQ4NzgKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGMx OGZiMzY4Nzc2MWMxNjdhYTgyZjI5MzcxYzBhYWU2ZjdkNDE5MzcuLjljMzhlM2IwMTQwNjhiNWQ5 NGI2OTc4N2QwMTFiYzhjMTU2MWM2YjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSw1 ICsxLDM2IEBACiAyMDExLTA5LTA5ICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBs ZS5jb20+CiAKKyAgICAgICAgUmVtb3ZlIHRvUHJpbWl0aXZlIGZyb20gSlNDZWxsCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Nzg3NQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhcnQgb2YgdGhlIHJlZmFj dG9yaW5nIHByb2Nlc3MgdG8gdW4tdmlydHVhbGl6ZSBKU0NlbGwuICBXZSBtb3ZlIAorICAgICAg ICBhbGwgb2YgdGhlIGltcGxpY2l0IGZ1bmN0aW9uYWxpdHkgcHJvdmlkZWQgYnkgdGhlIHZpcnV0 YWwgdG9QcmltaXRpdmUgbWV0aG9kIAorICAgICAgICBpbiBKU0NlbGwgdG8gYmUgZXhwbGljaXQg aW4gSlNWYWx1ZTo6dG9QcmltaXRpdmUuCisKKyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS5leHA6 CisgICAgICAgICogSmF2YVNjcmlwdENvcmUudmNwcm9qL0phdmFTY3JpcHRDb3JlL0phdmFTY3Jp cHRDb3JlLmRlZjoKKyAgICAgICAgKiBydW50aW1lL0pTQ2VsbC5jcHA6CisgICAgICAgICogcnVu dGltZS9KU0NlbGwuaDoKKyAgICAgICAgKiBydW50aW1lL0pTTm90QW5PYmplY3QuY3BwOgorCisg ICAgICAgIFdlIHJlcGxhY2UgSlNOb3RBbk9iamVjdDo6dG9QcmltaXRpdmUgd2l0aCBkZWZhdWx0 VmFsdWUsIHdoaWNoIGl0IG92ZXJyaWRlcyBmcm9tIAorICAgICAgICBKU09iamVjdC4gIFRoaXMg d2FzIHB1c2ggdGhlIHZpcnR1YWwgbWV0aG9kIGZ1cnRoZXIgZG93biwgZW5hYmxpbmcgdXMgdG8g Z2V0IHJpZCAKKyAgICAgICAgb2YgdGhlIHZpcnR1YWwgY2FsbCBpbiBKU0NlbGwuICBFdmVudHVh bGx5IHdlJ2xsIHByb2JhYmx5IGhhdmUgdG8gZGVhbCB3aXRoIHRoaXMKKyAgICAgICAgYWdhaW4s IGJ1dCB3ZSdsbCBjcm9zcyB0aGF0IGJyaWRnZSB3aGVuIHdlIGNvbWUgdG8gaXQuCisgICAgICAg IChKU0M6OkpTTm90QW5PYmplY3Q6OmRlZmF1bHRWYWx1ZSk6CisgICAgICAgICogcnVudGltZS9K U05vdEFuT2JqZWN0Lmg6CisgICAgICAgICogcnVudGltZS9KU09iamVjdC5oOgorICAgICAgICAo SlNDOjpKU1ZhbHVlOjp0b1ByaW1pdGl2ZSk6CisKKyAgICAgICAgV2UgaGF2ZSB0byBtb3ZlIHRv UHJpbWl0aXZlU3RyaW5nIHNpbmNlIEpTQ2VsbCBubyBsb25nZXIgaGFzIGEgdG9QcmltaXRpdmUg Y2FsbCwKKyAgICAgICAgd2hpY2ggdG9QcmltaXRpdmVTdHJpbmcgdXNlZCB0byBkZXBlbmQgb24u CisgICAgICAgIChKU0M6OkpTVmFsdWU6OnRvUHJpbWl0aXZlU3RyaW5nKToKKyAgICAgICAgKiBy dW50aW1lL0pTU3RyaW5nLmg6CisKKzIwMTEtMDktMDkgIE1hcmsgSGFobmVuYmVyZyAgPG1oYWhu ZW5iZXJnQGFwcGxlLmNvbT4KKwogICAgICAgICBVbnppcCBpbml0aWFsaXphdGlvbiBsaXN0cyBh bmQgY29uc3RydWN0b3JzIGluIEpTQ2VsbCBoaWVyYXJjaHkgKDUvNykKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY3NDIwCiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5leHAgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCmluZGV4IDgzY2U4NTA2OGE2ZmY4ZWRiYTQ4YmZhYzk4 OThkMDQxOTI1OWJmZjQuLmY4OTg0Nzg4YzNkYzRkZjZkNjNhNmEyMDFkZjIzN2FkMjAxNGFjZWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5leHAKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmV4cApAQCAtNTQ3LDcgKzU0 Nyw2IEBAIF9fWk5LM0pTQzE4UHJvcGVydHlEZXNjcmlwdG9yNmdldHRlckV2CiBfX1pOSzNKU0Mx OFByb3BlcnR5RGVzY3JpcHRvcjZzZXR0ZXJFdgogX19aTkszSlNDMThQcm9wZXJ0eURlc2NyaXB0 b3I4d3JpdGFibGVFdgogX19aTkszSlNDMTlTb3VyY2VQcm92aWRlckNhY2hlOGJ5dGVTaXplRXYK LV9fWk5LM0pTQzZKU0NlbGwxMXRvUHJpbWl0aXZlRVBOU185RXhlY1N0YXRlRU5TXzIyUHJlZmVy cmVkUHJpbWl0aXZlVHlwZUUKIF9fWk5LM0pTQzZKU0NlbGwxMnRvVGhpc09iamVjdEVQTlNfOUV4 ZWNTdGF0ZUUKIF9fWk5LM0pTQzZKU0NlbGwxNGlzR2V0dGVyU2V0dGVyRXYKIF9fWk5LM0pTQzZK U0NlbGw4dG9OdW1iZXJFUE5TXzlFeGVjU3RhdGVFCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvSmF2YVNjcmlwdENvcmUudmNwcm9qL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRD b3JlLmRlZiBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS52Y3Byb2ovSmF2 YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZGVmCmluZGV4IDViMzgwNmEyZTIzZTViNWU0Yzgy MDI0MmE3MDZmNmM2M2IyNGMwZWUuLjE5NjhhOWE2MDZiMTkxYTIwNWVjZjBkNmU3NTM5YzcyMmU1 NDNiODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS52 Y3Byb2ovSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZGVmCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS52Y3Byb2ovSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlw dENvcmUuZGVmCkBAIC0xOCw3ICsxOCw3IEBAIEVYUE9SVFMKICAgICA/PzBSZWdFeHBPYmplY3RA SlNDQEBJQUVAUEFWSlNHbG9iYWxPYmplY3RAMUBQQVZTdHJ1Y3R1cmVAMUBQQVZSZWdFeHBAMUBA WgogICAgID8/MFNIQTFAV1RGQEBRQUVAWFoKICAgICA/PzBTdHJpbmdPYmplY3RASlNDQEBJQUVA QUFWSlNHbG9iYWxEYXRhQDFAUEFWU3RydWN0dXJlQDFAQFoKLSAgID8/MFN0cnVjdHVyZUBKU0NA QEFBRUBBQVZKU0dsb2JhbERhdGFAMUBQQVZKU0dsb2JhbE9iamVjdEAxQFZKU1ZhbHVlQDFAQUJW VHlwZUluZm9AMUBJUEJVQ2xhc3NJbmZvQDFAQFoKKyAgICA/PzBTdHJ1Y3R1cmVASlNDQEBBQUVA QUFWSlNHbG9iYWxEYXRhQDFAUEFWSlNHbG9iYWxPYmplY3RAMUBWSlNWYWx1ZUAxQEFCVlR5cGVJ bmZvQDFASVBCVUNsYXNzSW5mb0AxQEBaCiAgICAgPz8wVGhyZWFkQ29uZGl0aW9uQFdURkBAUUFF QFhaCiAgICAgPz8wVVN0cmluZ0BKU0NAQFFBRUBQQkRAWgogICAgID8/MFVTdHJpbmdASlNDQEBR QUVAUEJESUBaCkBAIC0zNTgsOCArMzU4LDYgQEAgRVhQT1JUUwogICAgID90b09iamVjdEBKU0Nl bGxASlNDQEBVQkVQQVZKU09iamVjdEAyQFBBVkV4ZWNTdGF0ZUAyQFBBVkpTR2xvYmFsT2JqZWN0 QDJAQFoKICAgICA/dG9PYmplY3RASlNPYmplY3RASlNDQEBVQkVQQVYxMkBQQVZFeGVjU3RhdGVA MkBQQVZKU0dsb2JhbE9iamVjdEAyQEBaCiAgICAgP3RvT2JqZWN0U2xvd0Nhc2VASlNWYWx1ZUBK U0NAQEFCRVBBVkpTT2JqZWN0QDJAUEFWRXhlY1N0YXRlQDJAUEFWSlNHbG9iYWxPYmplY3RAMkBA WgotICAgID90b1ByaW1pdGl2ZUBKU0NlbGxASlNDQEBVQkU/QVZKU1ZhbHVlQDJAUEFWRXhlY1N0 YXRlQDJAVzRQcmVmZXJyZWRQcmltaXRpdmVUeXBlQDJAQFoKLSAgICA/dG9QcmltaXRpdmVASlNT dHJpbmdASlNDQEBFQkU/QVZKU1ZhbHVlQDJAUEFWRXhlY1N0YXRlQDJAVzRQcmVmZXJyZWRQcmlt aXRpdmVUeXBlQDJAQFoKICAgICA/dG9TdHJpY3RUaGlzT2JqZWN0QEpTT2JqZWN0QEpTQ0BAVUJF P0FWSlNWYWx1ZUAyQFBBVkV4ZWNTdGF0ZUAyQEBaCiAgICAgP3RvU3RyaW5nQEpTQ2VsbEBKU0NA QFVCRT9BVlVTdHJpbmdAMkBQQVZFeGVjU3RhdGVAMkBAWgogICAgID90b1N0cmluZ0BKU09iamVj dEBKU0NAQFVCRT9BVlVTdHJpbmdAMkBQQVZFeGVjU3RhdGVAMkBAWgpkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxsLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0pTQ2VsbC5jcHAKaW5kZXggYTZjODM4YzIzYzEyOTUxN2IyNWNlYmJiOWRi YzFkYzM2ZmNmNzU3Mi4uYTQxZDk2Zjg4NTg2MDRlOTVjZTQ0MDYxMGYxOWQ1ZDc3NjViZmJmNiAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxsLmNwcAorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0NlbGwuY3BwCkBAIC0xMjIsMTIgKzEy Miw2IEBAIGJvb2wgSlNDZWxsOjppc0dldHRlclNldHRlcigpIGNvbnN0CiAgICAgcmV0dXJuIGZh bHNlOwogfQogCi1KU1ZhbHVlIEpTQ2VsbDo6dG9QcmltaXRpdmUoRXhlY1N0YXRlKiwgUHJlZmVy cmVkUHJpbWl0aXZlVHlwZSkgY29uc3QKLXsKLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAg ICByZXR1cm4gSlNWYWx1ZSgpOwotfQotCiBib29sIEpTQ2VsbDo6Z2V0UHJpbWl0aXZlTnVtYmVy KEV4ZWNTdGF0ZSosIGRvdWJsZSYsIEpTVmFsdWUmKQogewogICAgIEFTU0VSVF9OT1RfUkVBQ0hF RCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxsLmgg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0NlbGwuaAppbmRleCBlMTA2NDQ2NmYw NzQ4MDUzY2Q5MGJmNGQ5OTE0ODQwMWMxMjE1ZDQwLi5mNjNlZTJmOTc2Y2QwNmJiNTgwOGUzNDll OWU4OTc2ZTA0MmJmYTYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9KU0NlbGwuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0NlbGwuaApA QCAtMTA0LDcgKzEwNCw2IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICB2aXJ0dWFsIENvbnN0 cnVjdFR5cGUgZ2V0Q29uc3RydWN0RGF0YShDb25zdHJ1Y3REYXRhJik7CiAKICAgICAgICAgLy8g QmFzaWMgY29udmVyc2lvbnMuCi0gICAgICAgIHZpcnR1YWwgSlNWYWx1ZSB0b1ByaW1pdGl2ZShF eGVjU3RhdGUqLCBQcmVmZXJyZWRQcmltaXRpdmVUeXBlKSBjb25zdDsKICAgICAgICAgdmlydHVh bCBib29sIGdldFByaW1pdGl2ZU51bWJlcihFeGVjU3RhdGUqLCBkb3VibGUmIG51bWJlciwgSlNW YWx1ZSYpOwogICAgICAgICB2aXJ0dWFsIGJvb2wgdG9Cb29sZWFuKEV4ZWNTdGF0ZSopIGNvbnN0 OwogICAgICAgICB2aXJ0dWFsIGRvdWJsZSB0b051bWJlcihFeGVjU3RhdGUqKSBjb25zdDsKQEAg LTI4MywxMSArMjgyLDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHJldHVybiBmYWxzZTsK ICAgICB9CiAKLSAgICBpbmxpbmUgSlNWYWx1ZSBKU1ZhbHVlOjp0b1ByaW1pdGl2ZShFeGVjU3Rh dGUqIGV4ZWMsIFByZWZlcnJlZFByaW1pdGl2ZVR5cGUgcHJlZmVycmVkVHlwZSkgY29uc3QKLSAg ICB7Ci0gICAgICAgIHJldHVybiBpc0NlbGwoKSA/IGFzQ2VsbCgpLT50b1ByaW1pdGl2ZShleGVj LCBwcmVmZXJyZWRUeXBlKSA6IGFzVmFsdWUoKTsKLSAgICB9Ci0KICAgICBpbmxpbmUgYm9vbCBK U1ZhbHVlOjpnZXRQcmltaXRpdmVOdW1iZXIoRXhlY1N0YXRlKiBleGVjLCBkb3VibGUmIG51bWJl ciwgSlNWYWx1ZSYgdmFsdWUpCiAgICAgewogICAgICAgICBpZiAoaXNJbnQzMigpKSB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU05vdEFuT2JqZWN0LmNwcCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTm90QW5PYmplY3QuY3BwCmluZGV4IDVm OTQ4ZjQzOTVkZmYxZTJmM2I3OWUxMTY1OTJmOTNmMjI1MTQ0YTAuLjAzYjY3ZDVmM2Q0MzFkOTNl MWM5NmU0YzE1YjE3ZWE5NWVjNjRlNmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0pTTm90QW5PYmplY3QuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0pTTm90QW5PYmplY3QuY3BwCkBAIC0zNyw3ICszNyw3IEBAIG5hbWVzcGFjZSBKU0Mg ewogQVNTRVJUX0NMQVNTX0ZJVFNfSU5fQ0VMTChKU05vdEFuT2JqZWN0KTsKIAogLy8gSlNWYWx1 ZSBtZXRob2RzCi1KU1ZhbHVlIEpTTm90QW5PYmplY3Q6OnRvUHJpbWl0aXZlKEV4ZWNTdGF0ZSog ZXhlYywgUHJlZmVycmVkUHJpbWl0aXZlVHlwZSkgY29uc3QKK0pTVmFsdWUgSlNOb3RBbk9iamVj dDo6ZGVmYXVsdFZhbHVlKEV4ZWNTdGF0ZSogZXhlYywgUHJlZmVycmVkUHJpbWl0aXZlVHlwZSkg Y29uc3QKIHsKICAgICBBU1NFUlRfVU5VU0VEKGV4ZWMsIGV4ZWMtPmhhZEV4Y2VwdGlvbigpKTsK ICAgICByZXR1cm4ganNOdW1iZXIoMCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU05vdEFuT2JqZWN0LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9KU05vdEFuT2JqZWN0LmgKaW5kZXggN2I2OGI1MjJjY2Y3NjJkMWQxMzVjYzZjMTc0NWJiOWQz MzhjNjIxMC4uNTYxNzVkYWI0NDliOGY5ZDBiYWY3Mjg4NTYyYTE2NjY4YWU4NDRmMCAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNOb3RBbk9iamVjdC5oCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTm90QW5PYmplY3QuaApAQCAtNjMsNyAr NjMsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIFN0 cnVjdHVyZUZsYWdzID0gT3ZlcnJpZGVzR2V0T3duUHJvcGVydHlTbG90IHwgT3ZlcnJpZGVzR2V0 UHJvcGVydHlOYW1lcyB8IEpTT2JqZWN0OjpTdHJ1Y3R1cmVGbGFnczsKIAogICAgICAgICAvLyBK U1ZhbHVlIG1ldGhvZHMKLSAgICAgICAgdmlydHVhbCBKU1ZhbHVlIHRvUHJpbWl0aXZlKEV4ZWNT dGF0ZSosIFByZWZlcnJlZFByaW1pdGl2ZVR5cGUpIGNvbnN0OworICAgICAgICB2aXJ0dWFsIEpT VmFsdWUgZGVmYXVsdFZhbHVlKEV4ZWNTdGF0ZSosIFByZWZlcnJlZFByaW1pdGl2ZVR5cGUpIGNv bnN0OwogICAgICAgICB2aXJ0dWFsIGJvb2wgZ2V0UHJpbWl0aXZlTnVtYmVyKEV4ZWNTdGF0ZSos IGRvdWJsZSYgbnVtYmVyLCBKU1ZhbHVlJik7CiAgICAgICAgIHZpcnR1YWwgYm9vbCB0b0Jvb2xl YW4oRXhlY1N0YXRlKikgY29uc3Q7CiAgICAgICAgIHZpcnR1YWwgZG91YmxlIHRvTnVtYmVyKEV4 ZWNTdGF0ZSopIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSlNPYmplY3QuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgK aW5kZXggYmM0MzJkM2FjOGYyOTI2ZDk1NWRjNmVjYzY5MjFmNThiNThkYzQwZi4uMjBlY2VlYTJh YjQ5ZmYyM2YyNGEzYWY3ZDBjOGY1YmQ4YmJjMDJkNyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9KU09iamVjdC5oCkBAIC0xMzIsNyArMTMyLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAg ICAgICAgIHZpcnR1YWwgdm9pZCBnZXRQcm9wZXJ0eU5hbWVzKEV4ZWNTdGF0ZSosIFByb3BlcnR5 TmFtZUFycmF5JiwgRW51bWVyYXRpb25Nb2RlIG1vZGUgPSBFeGNsdWRlRG9udEVudW1Qcm9wZXJ0 aWVzKTsKICAgICAgICAgdmlydHVhbCB2b2lkIGdldE93blByb3BlcnR5TmFtZXMoRXhlY1N0YXRl KiwgUHJvcGVydHlOYW1lQXJyYXkmLCBFbnVtZXJhdGlvbk1vZGUgbW9kZSA9IEV4Y2x1ZGVEb250 RW51bVByb3BlcnRpZXMpOwogCi0gICAgICAgIHZpcnR1YWwgSlNWYWx1ZSB0b1ByaW1pdGl2ZShF eGVjU3RhdGUqLCBQcmVmZXJyZWRQcmltaXRpdmVUeXBlID0gTm9QcmVmZXJlbmNlKSBjb25zdDsK KyAgICAgICAgSlNWYWx1ZSB0b1ByaW1pdGl2ZShFeGVjU3RhdGUqLCBQcmVmZXJyZWRQcmltaXRp dmVUeXBlID0gTm9QcmVmZXJlbmNlKSBjb25zdDsKICAgICAgICAgdmlydHVhbCBib29sIGdldFBy aW1pdGl2ZU51bWJlcihFeGVjU3RhdGUqLCBkb3VibGUmIG51bWJlciwgSlNWYWx1ZSYgdmFsdWUp OwogICAgICAgICB2aXJ0dWFsIGJvb2wgdG9Cb29sZWFuKEV4ZWNTdGF0ZSopIGNvbnN0OwogICAg ICAgICB2aXJ0dWFsIGRvdWJsZSB0b051bWJlcihFeGVjU3RhdGUqKSBjb25zdDsKQEAgLTkwNSw2 ICs5MDUsMzQgQEAgQUxXQVlTX0lOTElORSB2b2lkIEpTT2JqZWN0Ojp2aXNpdENoaWxkcmVuRGly ZWN0KFNsb3RWaXNpdG9yJiB2aXNpdG9yKQogCiAvLyAtLS0gSlNWYWx1ZSBpbmxpbmVzIC0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAoraW5saW5lIEpTVmFsdWUgSlNWYWx1ZTo6dG9Qcmlt aXRpdmUoRXhlY1N0YXRlKiBleGVjLCBQcmVmZXJyZWRQcmltaXRpdmVUeXBlIHByZWZlcnJlZFR5 cGUpIGNvbnN0Cit7CisgICAgaWYgKGlzU3RyaW5nKCkpCisgICAgICAgIHJldHVybiAqY29uc3Rf Y2FzdDxKU1ZhbHVlKj4odGhpcyk7CisgICAgaWYgKGlzQ2VsbCgpKQorICAgICAgICByZXR1cm4g c3RhdGljX2Nhc3Q8SlNPYmplY3QqPihhc0NlbGwoKSktPnRvUHJpbWl0aXZlKGV4ZWMsIHByZWZl cnJlZFR5cGUpOworICAgIHJldHVybiBhc1ZhbHVlKCk7Cit9CisKK2lubGluZSBVU3RyaW5nIEpT VmFsdWU6OnRvUHJpbWl0aXZlU3RyaW5nKEV4ZWNTdGF0ZSogZXhlYykgY29uc3QKK3sKKyAgICBB U1NFUlQoIWlzU3RyaW5nKCkpOworICAgIGlmIChpc0ludDMyKCkpCisgICAgICAgIHJldHVybiBl eGVjLT5nbG9iYWxEYXRhKCkubnVtZXJpY1N0cmluZ3MuYWRkKGFzSW50MzIoKSk7CisgICAgaWYg KGlzRG91YmxlKCkpCisgICAgICAgIHJldHVybiBleGVjLT5nbG9iYWxEYXRhKCkubnVtZXJpY1N0 cmluZ3MuYWRkKGFzRG91YmxlKCkpOworICAgIGlmIChpc1RydWUoKSkKKyAgICAgICAgcmV0dXJu ICJ0cnVlIjsKKyAgICBpZiAoaXNGYWxzZSgpKQorICAgICAgICByZXR1cm4gImZhbHNlIjsKKyAg ICBpZiAoaXNOdWxsKCkpCisgICAgICAgIHJldHVybiAibnVsbCI7CisgICAgaWYgKGlzVW5kZWZp bmVkKCkpCisgICAgICAgIHJldHVybiAidW5kZWZpbmVkIjsKKyAgICBBU1NFUlQoaXNDZWxsKCkp OworICAgIHJldHVybiAoKEpTT2JqZWN0Kilhc0NlbGwoKSktPnRvUHJpbWl0aXZlKGV4ZWMsIE5v UHJlZmVyZW5jZSkudG9TdHJpbmcoZXhlYyk7Cit9CisKIEFMV0FZU19JTkxJTkUgVVN0cmluZyBK U1ZhbHVlOjp0b1RoaXNTdHJpbmcoRXhlY1N0YXRlKiBleGVjKSBjb25zdAogewogICAgIHJldHVy biBpc1N0cmluZygpID8gc3RhdGljX2Nhc3Q8SlNTdHJpbmcqPihhc0NlbGwoKSktPnZhbHVlKGV4 ZWMpIDogdG9UaGlzT2JqZWN0KGV4ZWMpLT50b1N0cmluZyhleGVjKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTU3RyaW5nLmggYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9KU1N0cmluZy5oCmluZGV4IDYzODIwMzFiMmRiNTkwN2JlOWEzMTA2YWI4 ODlhYTYxNDc0ZDM2YjQuLjZlNDc5OGM1ZTZkYTdlYjlkZWQxZDc3NjMxMDY1YjUyYTczZDhjNzIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTU3RyaW5nLmgKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNTdHJpbmcuaApAQCAtNDkyLDcgKzQ5 Miw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAgICAgfQogICAgICAgICB9CiAKLSAgICAg ICAgdmlydHVhbCBKU1ZhbHVlIHRvUHJpbWl0aXZlKEV4ZWNTdGF0ZSosIFByZWZlcnJlZFByaW1p dGl2ZVR5cGUpIGNvbnN0OworICAgICAgICBKU1ZhbHVlIHRvUHJpbWl0aXZlKEV4ZWNTdGF0ZSos IFByZWZlcnJlZFByaW1pdGl2ZVR5cGUpIGNvbnN0OwogICAgICAgICB2aXJ0dWFsIGJvb2wgZ2V0 UHJpbWl0aXZlTnVtYmVyKEV4ZWNTdGF0ZSosIGRvdWJsZSYgbnVtYmVyLCBKU1ZhbHVlJiB2YWx1 ZSk7CiAgICAgICAgIHZpcnR1YWwgYm9vbCB0b0Jvb2xlYW4oRXhlY1N0YXRlKikgY29uc3Q7CiAg ICAgICAgIHZpcnR1YWwgZG91YmxlIHRvTnVtYmVyKEV4ZWNTdGF0ZSopIGNvbnN0OwpAQCAtNzAy LDI1ICs3MDIsNiBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgcmV0dXJuIGFzQ2VsbCgpLT50 b1N0cmluZyhleGVjKTsKICAgICB9CiAKLSAgICBpbmxpbmUgVVN0cmluZyBKU1ZhbHVlOjp0b1By aW1pdGl2ZVN0cmluZyhFeGVjU3RhdGUqIGV4ZWMpIGNvbnN0Ci0gICAgewotICAgICAgICBBU1NF UlQoIWlzU3RyaW5nKCkpOwotICAgICAgICBpZiAoaXNJbnQzMigpKQotICAgICAgICAgICAgcmV0 dXJuIGV4ZWMtPmdsb2JhbERhdGEoKS5udW1lcmljU3RyaW5ncy5hZGQoYXNJbnQzMigpKTsKLSAg ICAgICAgaWYgKGlzRG91YmxlKCkpCi0gICAgICAgICAgICByZXR1cm4gZXhlYy0+Z2xvYmFsRGF0 YSgpLm51bWVyaWNTdHJpbmdzLmFkZChhc0RvdWJsZSgpKTsKLSAgICAgICAgaWYgKGlzVHJ1ZSgp KQotICAgICAgICAgICAgcmV0dXJuICJ0cnVlIjsKLSAgICAgICAgaWYgKGlzRmFsc2UoKSkKLSAg ICAgICAgICAgIHJldHVybiAiZmFsc2UiOwotICAgICAgICBpZiAoaXNOdWxsKCkpCi0gICAgICAg ICAgICByZXR1cm4gIm51bGwiOwotICAgICAgICBpZiAoaXNVbmRlZmluZWQoKSkKLSAgICAgICAg ICAgIHJldHVybiAidW5kZWZpbmVkIjsKLSAgICAgICAgQVNTRVJUKGlzQ2VsbCgpKTsKLSAgICAg ICAgcmV0dXJuIGFzQ2VsbCgpLT50b1ByaW1pdGl2ZShleGVjLCBOb1ByZWZlcmVuY2UpLnRvU3Ry aW5nKGV4ZWMpOwotICAgIH0KLQogfSAvLyBuYW1lc3BhY2UgSlNDCiAKICNlbmRpZiAvLyBKU1N0 cmluZ19oCg== 107708 2011-09-16 12:56:25 -0700 2011-09-19 11:28:35 -0700 Patch bug-67875-20110916125621.patch text/plain 6620 mhahnenberg U3VidmVyc2lvbiBSZXZpc2lvbjogOTUyOTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDE5 Yjc1NzY2ZjYwY2NiYWVlN2M0ZWFhNjdkNmUyMTNkZWE2YjY4MWEuLmMxMTljNmQzM2QxYTJkZDU5 M2UzM2E3Njg3MzQyMjE0MWZkODNkMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDMwIEBACisyMDExLTA5LTE2ICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBs ZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHRvUHJpbWl0aXZlIGZyb20gSlNDZWxsCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Nzg3NQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhcnQgb2YgdGhlIHJlZmFj dG9yaW5nIHByb2Nlc3MgdG8gdW4tdmlydHVhbGl6ZSBKU0NlbGwuICBXZSBtb3ZlIAorICAgICAg ICBhbGwgb2YgdGhlIGltcGxpY2l0IGZ1bmN0aW9uYWxpdHkgcHJvdmlkZWQgYnkgdGhlIHZpcnR1 YWwgdG9QcmltaXRpdmUgbWV0aG9kIAorICAgICAgICBpbiBKU0NlbGwgdG8gYmUgZXhwbGljaXQg aW4gSlNWYWx1ZTo6dG9QcmltaXRpdmUgYW5kIEpTQ2VsbDp0b1ByaW1pdGl2ZSB3aGlsZSAKKyAg ICAgICAgYWxzbyBkZS12aXJ0dWFsaXppbmcgSlNDZWxsOjp0b1ByaW1pdGl2ZS4KKworICAgICAg ICAqIHJ1bnRpbWUvSlNDZWxsLmNwcDoKKyAgICAgICAgKEpTQzo6SlNDZWxsOjp0b1ByaW1pdGl2 ZSk6CisgICAgICAgICogcnVudGltZS9KU0NlbGwuaDoKKworICAgICAgICBXZSByZXBsYWNlIEpT Tm90QW5PYmplY3Q6OnRvUHJpbWl0aXZlIHdpdGggZGVmYXVsdFZhbHVlLCB3aGljaCBpdCBvdmVy cmlkZXMgZnJvbSAKKyAgICAgICAgSlNPYmplY3QuICBUaGlzIHB1c2hlcyB0aGUgdmlydHVhbCBt ZXRob2QgZnVydGhlciBkb3duLCBlbmFibGluZyB1cyB0byBnZXQgcmlkIAorICAgICAgICBvZiB0 aGUgdmlydHVhbCBjYWxsIGluIEpTQ2VsbC4gIEV2ZW50dWFsbHkgd2UnbGwgcHJvYmFibHkgaGF2 ZSB0byBkZWFsIHdpdGggdGhpcworICAgICAgICBhZ2FpbiwgYnV0IHdlJ2xsIGNyb3NzIHRoYXQg YnJpZGdlIHdoZW4gd2UgY29tZSB0byBpdC4KKyAgICAgICAgKiBydW50aW1lL0pTTm90QW5PYmpl Y3QuY3BwOgorICAgICAgICAoSlNDOjpKU05vdEFuT2JqZWN0OjpkZWZhdWx0VmFsdWUpOgorICAg ICAgICAqIHJ1bnRpbWUvSlNOb3RBbk9iamVjdC5oOgorICAgICAgICAqIHJ1bnRpbWUvSlNPYmpl Y3QuaDoKKyAgICAgICAgKiBydW50aW1lL0pTU3RyaW5nLmg6CisgICAgICAgIChKU0M6OkpTVmFs dWU6OnRvUHJpbWl0aXZlKToKKwogMjAxMS0wOS0xNSAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBw bGUuY29tPgogCiAgICAgICAgIERGRyBKSVQgZG9lcyBub3Qgb3B0aW1pemUgbWV0aG9kX2NoZWNr CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0NlbGwuY3BwIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxsLmNwcAppbmRleCA5YTkzYzU5MjA1 Y2MzYjUxMDViNjhlZjY2MTcwNTIwNzg0MmU5MzIzLi45Y2ZkMWJhODNjOTAwYmJmZTIzMzgwYzNh ZjliNjlmZGVlYzU0NGExIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9KU0NlbGwuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQ2VsbC5j cHAKQEAgLTExNywxMCArMTE3LDExIEBAIEpTVmFsdWUgSlNDZWxsOjpnZXRKU051bWJlcigpCiAg ICAgcmV0dXJuIEpTVmFsdWUoKTsKIH0KIAotSlNWYWx1ZSBKU0NlbGw6OnRvUHJpbWl0aXZlKEV4 ZWNTdGF0ZSosIFByZWZlcnJlZFByaW1pdGl2ZVR5cGUpIGNvbnN0CitKU1ZhbHVlIEpTQ2VsbDo6 dG9QcmltaXRpdmUoRXhlY1N0YXRlKiBleGVjLCBQcmVmZXJyZWRQcmltaXRpdmVUeXBlIHByZWZl cnJlZFR5cGUpIGNvbnN0CiB7Ci0gICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgcmV0dXJu IEpTVmFsdWUoKTsKKyAgICBpZiAoaXNTdHJpbmcoKSkKKyAgICAgICAgcmV0dXJuICgoSlNTdHJp bmcqKXRoaXMpLT50b1ByaW1pdGl2ZShleGVjLCBwcmVmZXJyZWRUeXBlKTsKKyAgICByZXR1cm4g KChKU09iamVjdCopdGhpcyktPnRvUHJpbWl0aXZlKGV4ZWMsIHByZWZlcnJlZFR5cGUpOwogfQog CiBib29sIEpTQ2VsbDo6Z2V0UHJpbWl0aXZlTnVtYmVyKEV4ZWNTdGF0ZSosIGRvdWJsZSYsIEpT VmFsdWUmKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxs LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0NlbGwuaAppbmRleCAxNDc1ODRi NjQ5YmEzM2EzOTM5YjI2NTZlMWU4Y2YzMTE1YjU2NGI3Li42Mzk4MmRhNjEzOWZmMzcxZDc2OGFk NTYyYWZlMzZlYWM1ODI5MTI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9KU0NlbGwuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0NlbGwu aApAQCAtMTAzLDcgKzEwMyw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICB2aXJ0dWFsIENv bnN0cnVjdFR5cGUgZ2V0Q29uc3RydWN0RGF0YShDb25zdHJ1Y3REYXRhJik7CiAKICAgICAgICAg Ly8gQmFzaWMgY29udmVyc2lvbnMuCi0gICAgICAgIHZpcnR1YWwgSlNWYWx1ZSB0b1ByaW1pdGl2 ZShFeGVjU3RhdGUqLCBQcmVmZXJyZWRQcmltaXRpdmVUeXBlKSBjb25zdDsKKyAgICAgICAgSlNW YWx1ZSB0b1ByaW1pdGl2ZShFeGVjU3RhdGUqLCBQcmVmZXJyZWRQcmltaXRpdmVUeXBlKSBjb25z dDsKICAgICAgICAgdmlydHVhbCBib29sIGdldFByaW1pdGl2ZU51bWJlcihFeGVjU3RhdGUqLCBk b3VibGUmIG51bWJlciwgSlNWYWx1ZSYpOwogICAgICAgICB2aXJ0dWFsIGJvb2wgdG9Cb29sZWFu KEV4ZWNTdGF0ZSopIGNvbnN0OwogICAgICAgICB2aXJ0dWFsIGRvdWJsZSB0b051bWJlcihFeGVj U3RhdGUqKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0pTTm90QW5PYmplY3QuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNOb3RB bk9iamVjdC5jcHAKaW5kZXggNWY5NDhmNDM5NWRmZjFlMmYzYjc5ZTExNjU5MmY5M2YyMjUxNDRh MC4uMDNiNjdkNWYzZDQzMWQ5M2UxYzk2ZTRjMTViMTdlYTk1ZWM2NGU2ZSAxMDA2NDQKLS0tIGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNOb3RBbk9iamVjdC5jcHAKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNOb3RBbk9iamVjdC5jcHAKQEAgLTM3LDcgKzM3 LDcgQEAgbmFtZXNwYWNlIEpTQyB7CiBBU1NFUlRfQ0xBU1NfRklUU19JTl9DRUxMKEpTTm90QW5P YmplY3QpOwogCiAvLyBKU1ZhbHVlIG1ldGhvZHMKLUpTVmFsdWUgSlNOb3RBbk9iamVjdDo6dG9Q cmltaXRpdmUoRXhlY1N0YXRlKiBleGVjLCBQcmVmZXJyZWRQcmltaXRpdmVUeXBlKSBjb25zdAor SlNWYWx1ZSBKU05vdEFuT2JqZWN0OjpkZWZhdWx0VmFsdWUoRXhlY1N0YXRlKiBleGVjLCBQcmVm ZXJyZWRQcmltaXRpdmVUeXBlKSBjb25zdAogewogICAgIEFTU0VSVF9VTlVTRUQoZXhlYywgZXhl Yy0+aGFkRXhjZXB0aW9uKCkpOwogICAgIHJldHVybiBqc051bWJlcigwKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTm90QW5PYmplY3QuaCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTm90QW5PYmplY3QuaAppbmRleCAyMWZlNDI5MTZiYWE2 NGUyMjAzMWEzNTVlNGFhZWQyYTlhZTQ4OTFiLi43YzhlNjNjMGJmYmJhMDA4OTM3OGNiZDEyZDk3 MzUxNWFlN2ZiNTU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U05vdEFuT2JqZWN0LmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNOb3RB bk9iamVjdC5oCkBAIC02Myw3ICs2Myw3IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBzdGF0 aWMgY29uc3QgdW5zaWduZWQgU3RydWN0dXJlRmxhZ3MgPSBPdmVycmlkZXNHZXRPd25Qcm9wZXJ0 eVNsb3QgfCBPdmVycmlkZXNHZXRQcm9wZXJ0eU5hbWVzIHwgSlNPYmplY3Q6OlN0cnVjdHVyZUZs YWdzOwogCiAgICAgICAgIC8vIEpTVmFsdWUgbWV0aG9kcwotICAgICAgICB2aXJ0dWFsIEpTVmFs dWUgdG9QcmltaXRpdmUoRXhlY1N0YXRlKiwgUHJlZmVycmVkUHJpbWl0aXZlVHlwZSkgY29uc3Q7 CisgICAgICAgIHZpcnR1YWwgSlNWYWx1ZSBkZWZhdWx0VmFsdWUoRXhlY1N0YXRlKiwgUHJlZmVy cmVkUHJpbWl0aXZlVHlwZSkgY29uc3Q7CiAgICAgICAgIHZpcnR1YWwgYm9vbCBnZXRQcmltaXRp dmVOdW1iZXIoRXhlY1N0YXRlKiwgZG91YmxlJiBudW1iZXIsIEpTVmFsdWUmKTsKICAgICAgICAg dmlydHVhbCBib29sIHRvQm9vbGVhbihFeGVjU3RhdGUqKSBjb25zdDsKICAgICAgICAgdmlydHVh bCBkb3VibGUgdG9OdW1iZXIoRXhlY1N0YXRlKikgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5oIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSlNPYmplY3QuaAppbmRleCA2ZjYyMGE5MjIwYmI5NjU5NmNlNjdmYmYwNzRkNjlk YzI2N2MwMWFmLi42M2M4NzllMzU1YWQwMTY4NTNlYzExYjI0MWNiMzA2NTM3ZmY5ZWQ5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5oCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgKQEAgLTEzMiw3ICsxMzIsNyBA QCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgdmlydHVhbCB2b2lkIGdldFByb3BlcnR5TmFtZXMo RXhlY1N0YXRlKiwgUHJvcGVydHlOYW1lQXJyYXkmLCBFbnVtZXJhdGlvbk1vZGUgbW9kZSA9IEV4 Y2x1ZGVEb250RW51bVByb3BlcnRpZXMpOwogICAgICAgICB2aXJ0dWFsIHZvaWQgZ2V0T3duUHJv cGVydHlOYW1lcyhFeGVjU3RhdGUqLCBQcm9wZXJ0eU5hbWVBcnJheSYsIEVudW1lcmF0aW9uTW9k ZSBtb2RlID0gRXhjbHVkZURvbnRFbnVtUHJvcGVydGllcyk7CiAKLSAgICAgICAgdmlydHVhbCBK U1ZhbHVlIHRvUHJpbWl0aXZlKEV4ZWNTdGF0ZSosIFByZWZlcnJlZFByaW1pdGl2ZVR5cGUgPSBO b1ByZWZlcmVuY2UpIGNvbnN0OworICAgICAgICBKU1ZhbHVlIHRvUHJpbWl0aXZlKEV4ZWNTdGF0 ZSosIFByZWZlcnJlZFByaW1pdGl2ZVR5cGUgPSBOb1ByZWZlcmVuY2UpIGNvbnN0OwogICAgICAg ICB2aXJ0dWFsIGJvb2wgZ2V0UHJpbWl0aXZlTnVtYmVyKEV4ZWNTdGF0ZSosIGRvdWJsZSYgbnVt YmVyLCBKU1ZhbHVlJiB2YWx1ZSk7CiAgICAgICAgIHZpcnR1YWwgYm9vbCB0b0Jvb2xlYW4oRXhl Y1N0YXRlKikgY29uc3Q7CiAgICAgICAgIHZpcnR1YWwgZG91YmxlIHRvTnVtYmVyKEV4ZWNTdGF0 ZSopIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNT dHJpbmcuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTU3RyaW5nLmgKaW5kZXgg N2IwZGNlMmY2MmNjNDdjYzVmYjM2NjMyM2ZmY2RkYTg1NjgyYjM4YS4uODFmYzRlMTlmNzQ1YTFm M2RjN2ZjNzc5Njk4YjFlOWZmYTY4YTFiNCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvSlNTdHJpbmcuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9KU1N0cmluZy5oCkBAIC00MjYsNiArNDI2LDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAg IH0KICAgICAgICAgdW5zaWduZWQgbGVuZ3RoKCkgeyByZXR1cm4gbV9sZW5ndGg7IH0KIAorICAg ICAgICBKU1ZhbHVlIHRvUHJpbWl0aXZlKEV4ZWNTdGF0ZSosIFByZWZlcnJlZFByaW1pdGl2ZVR5 cGUpIGNvbnN0OwogICAgICAgICBib29sIGdldFN0cmluZ1Byb3BlcnR5U2xvdChFeGVjU3RhdGUq LCBjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIFByb3BlcnR5U2xvdCYpOwogICAgICAg ICBib29sIGdldFN0cmluZ1Byb3BlcnR5U2xvdChFeGVjU3RhdGUqLCB1bnNpZ25lZCBwcm9wZXJ0 eU5hbWUsIFByb3BlcnR5U2xvdCYpOwogICAgICAgICBib29sIGdldFN0cmluZ1Byb3BlcnR5RGVz Y3JpcHRvcihFeGVjU3RhdGUqLCBjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIFByb3Bl cnR5RGVzY3JpcHRvciYpOwpAQCAtNDkyLDcgKzQ5Myw2IEBAIG5hbWVzcGFjZSBKU0MgewogICAg ICAgICAgICAgfQogICAgICAgICB9CiAKLSAgICAgICAgdmlydHVhbCBKU1ZhbHVlIHRvUHJpbWl0 aXZlKEV4ZWNTdGF0ZSosIFByZWZlcnJlZFByaW1pdGl2ZVR5cGUpIGNvbnN0OwogICAgICAgICB2 aXJ0dWFsIGJvb2wgZ2V0UHJpbWl0aXZlTnVtYmVyKEV4ZWNTdGF0ZSosIGRvdWJsZSYgbnVtYmVy LCBKU1ZhbHVlJiB2YWx1ZSk7CiAgICAgICAgIHZpcnR1YWwgYm9vbCB0b0Jvb2xlYW4oRXhlY1N0 YXRlKikgY29uc3Q7CiAgICAgICAgIHZpcnR1YWwgZG91YmxlIHRvTnVtYmVyKEV4ZWNTdGF0ZSop IGNvbnN0Owo= 107892 2011-09-19 11:28:39 -0700 2011-09-19 15:01:38 -0700 Patch bug-67875-20110919112838.patch text/plain 8804 mhahnenberg U3VidmVyc2lvbiBSZXZpc2lvbjogOTU0MjIKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDk0 Y2JmNTBmYTE5MDEyMGViNTdmZGI1ODAyYjMxOGEwYTY5YmFiOWYuLjE2MWFiMDE3ZWM3YTQ5NWZl ZWQwNzkxMWZkZmJlOTY2YzczODllZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDMxIEBACisyMDExLTA5LTE5ICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBs ZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHRvUHJpbWl0aXZlIGZyb20gSlNDZWxsCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Nzg3NQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhcnQgb2YgdGhlIHJlZmFj dG9yaW5nIHByb2Nlc3MgdG8gdW4tdmlydHVhbGl6ZSBKU0NlbGwuICBXZSBtb3ZlIAorICAgICAg ICBhbGwgb2YgdGhlIGltcGxpY2l0IGZ1bmN0aW9uYWxpdHkgcHJvdmlkZWQgYnkgdGhlIHZpcnR1 YWwgdG9QcmltaXRpdmUgbWV0aG9kIAorICAgICAgICBpbiBKU0NlbGwgdG8gYmUgZXhwbGljaXQg aW4gSlNWYWx1ZTo6dG9QcmltaXRpdmUgYW5kIEpTQ2VsbDp0b1ByaW1pdGl2ZSB3aGlsZSAKKyAg ICAgICAgYWxzbyBkZS12aXJ0dWFsaXppbmcgSlNDZWxsOjp0b1ByaW1pdGl2ZS4KKworICAgICAg ICAqIEphdmFTY3JpcHRDb3JlLnZjcHJvai9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5k ZWY6CisgICAgICAgICogcnVudGltZS9KU0NlbGwuY3BwOgorICAgICAgICAoSlNDOjpKU0NlbGw6 OnRvUHJpbWl0aXZlKToKKyAgICAgICAgKiBydW50aW1lL0pTQ2VsbC5oOgorCisgICAgICAgIFdl IHJlcGxhY2UgSlNOb3RBbk9iamVjdDo6dG9QcmltaXRpdmUgd2l0aCBkZWZhdWx0VmFsdWUsIHdo aWNoIGl0IG92ZXJyaWRlcyBmcm9tIAorICAgICAgICBKU09iamVjdC4gIFRoaXMgcHVzaGVzIHRo ZSB2aXJ0dWFsIG1ldGhvZCBmdXJ0aGVyIGRvd24sIGVuYWJsaW5nIHVzIHRvIGdldCByaWQgCisg ICAgICAgIG9mIHRoZSB2aXJ0dWFsIGNhbGwgaW4gSlNDZWxsLiAgRXZlbnR1YWxseSB3ZSdsbCBw cm9iYWJseSBoYXZlIHRvIGRlYWwgd2l0aCB0aGlzCisgICAgICAgIGFnYWluLCBidXQgd2UnbGwg Y3Jvc3MgdGhhdCBicmlkZ2Ugd2hlbiB3ZSBjb21lIHRvIGl0LgorICAgICAgICAqIHJ1bnRpbWUv SlNOb3RBbk9iamVjdC5jcHA6CisgICAgICAgIChKU0M6OkpTTm90QW5PYmplY3Q6OmRlZmF1bHRW YWx1ZSk6CisgICAgICAgICogcnVudGltZS9KU05vdEFuT2JqZWN0Lmg6CisgICAgICAgICogcnVu dGltZS9KU09iamVjdC5oOgorICAgICAgICAqIHJ1bnRpbWUvSlNTdHJpbmcuaDoKKyAgICAgICAg KEpTQzo6SlNWYWx1ZTo6dG9QcmltaXRpdmUpOgorCiAyMDExLTA5LTE5ICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBGaXggZGlzdGNo ZWNrIGJ1aWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENv cmUudmNwcm9qL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmRlZiBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS52Y3Byb2ovSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlw dENvcmUuZGVmCmluZGV4IDRmYTMzMzU3YzIyMGJkYTgxMzlmMTEzNGQ1ZDFlYmQ5NjNkM2U1ODIu LjM1Zjk2Y2VjNWNlOTM4ZjVjZTAwMzk1ZjE2NWFhNjY1ZjA1NjBiZTYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS52Y3Byb2ovSmF2YVNjcmlwdENvcmUv SmF2YVNjcmlwdENvcmUuZGVmCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0 Q29yZS52Y3Byb2ovSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZGVmCkBAIC0zNTYsOCAr MzU2LDYgQEAgRVhQT1JUUwogICAgID90b09iamVjdEBKU0NlbGxASlNDQEBVQkVQQVZKU09iamVj dEAyQFBBVkV4ZWNTdGF0ZUAyQFBBVkpTR2xvYmFsT2JqZWN0QDJAQFoKICAgICA/dG9PYmplY3RA SlNPYmplY3RASlNDQEBVQkVQQVYxMkBQQVZFeGVjU3RhdGVAMkBQQVZKU0dsb2JhbE9iamVjdEAy QEBaCiAgICAgP3RvT2JqZWN0U2xvd0Nhc2VASlNWYWx1ZUBKU0NAQEFCRVBBVkpTT2JqZWN0QDJA UEFWRXhlY1N0YXRlQDJAUEFWSlNHbG9iYWxPYmplY3RAMkBAWgotICAgID90b1ByaW1pdGl2ZUBK U0NlbGxASlNDQEBVQkU/QVZKU1ZhbHVlQDJAUEFWRXhlY1N0YXRlQDJAVzRQcmVmZXJyZWRQcmlt aXRpdmVUeXBlQDJAQFoKLSAgICA/dG9QcmltaXRpdmVASlNTdHJpbmdASlNDQEBFQkU/QVZKU1Zh bHVlQDJAUEFWRXhlY1N0YXRlQDJAVzRQcmVmZXJyZWRQcmltaXRpdmVUeXBlQDJAQFoKICAgICA/ dG9TdHJpY3RUaGlzT2JqZWN0QEpTT2JqZWN0QEpTQ0BAVUJFP0FWSlNWYWx1ZUAyQFBBVkV4ZWNT dGF0ZUAyQEBaCiAgICAgP3RvU3RyaW5nQEpTQ2VsbEBKU0NAQFVCRT9BVlVTdHJpbmdAMkBQQVZF eGVjU3RhdGVAMkBAWgogICAgID90b1N0cmluZ0BKU09iamVjdEBKU0NAQFVCRT9BVlVTdHJpbmdA MkBQQVZFeGVjU3RhdGVAMkBAWgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvSlNDZWxsLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQ2VsbC5j cHAKaW5kZXggOWE5M2M1OTIwNWNjM2I1MTA1YjY4ZWY2NjE3MDUyMDc4NDJlOTMyMy4uN2I3YzYw NDE2MWEyM2YzNTBhOTM3ZGY3Y2U2YTE0NGNmYzEyNjZkMSAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxsLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU0NlbGwuY3BwCkBAIC0zMCw2ICszMCwxMyBAQAogCiBuYW1lc3BhY2UgSlND IHsKIAorSlNWYWx1ZSBKU0NlbGw6OnRvUHJpbWl0aXZlKEV4ZWNTdGF0ZSogZXhlYywgUHJlZmVy cmVkUHJpbWl0aXZlVHlwZSBwcmVmZXJyZWRUeXBlKSBjb25zdAoreworICAgIGlmIChpc1N0cmlu ZygpKQorICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8Y29uc3QgSlNTdHJpbmcqPih0aGlzKS0+ dG9QcmltaXRpdmUoZXhlYywgcHJlZmVycmVkVHlwZSk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0 PGNvbnN0IEpTT2JqZWN0Kj4odGhpcyktPnRvUHJpbWl0aXZlKGV4ZWMsIHByZWZlcnJlZFR5cGUp OworfQorCiBib29sIEpTQ2VsbDo6Z2V0U3RyaW5nKEV4ZWNTdGF0ZSogZXhlYywgVVN0cmluZyZz dHJpbmdWYWx1ZSkgY29uc3QKIHsKICAgICBpZiAoIWlzU3RyaW5nKCkpCkBAIC0xMTcsMTIgKzEy NCw2IEBAIEpTVmFsdWUgSlNDZWxsOjpnZXRKU051bWJlcigpCiAgICAgcmV0dXJuIEpTVmFsdWUo KTsKIH0KIAotSlNWYWx1ZSBKU0NlbGw6OnRvUHJpbWl0aXZlKEV4ZWNTdGF0ZSosIFByZWZlcnJl ZFByaW1pdGl2ZVR5cGUpIGNvbnN0Ci17Ci0gICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAg cmV0dXJuIEpTVmFsdWUoKTsKLX0KLQogYm9vbCBKU0NlbGw6OmdldFByaW1pdGl2ZU51bWJlcihF eGVjU3RhdGUqLCBkb3VibGUmLCBKU1ZhbHVlJikKIHsKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQ2VsbC5oIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxsLmgKaW5kZXggMTQ3NTg0YjY0OWJh MzNhMzkzOWIyNjU2ZTFlOGNmMzExNWI1NjRiNy4uODcyYzc0YTc3NjE4MzFhZjA2M2ZlYWJjMzY0 MTJiNGUwOTg0N2Y3NyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv SlNDZWxsLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxsLmgKQEAg LTEwMyw3ICsxMDMsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgdmlydHVhbCBDb25zdHJ1 Y3RUeXBlIGdldENvbnN0cnVjdERhdGEoQ29uc3RydWN0RGF0YSYpOwogCiAgICAgICAgIC8vIEJh c2ljIGNvbnZlcnNpb25zLgotICAgICAgICB2aXJ0dWFsIEpTVmFsdWUgdG9QcmltaXRpdmUoRXhl Y1N0YXRlKiwgUHJlZmVycmVkUHJpbWl0aXZlVHlwZSkgY29uc3Q7CisgICAgICAgIEpTVmFsdWUg dG9QcmltaXRpdmUoRXhlY1N0YXRlKiwgUHJlZmVycmVkUHJpbWl0aXZlVHlwZSkgY29uc3Q7CiAg ICAgICAgIHZpcnR1YWwgYm9vbCBnZXRQcmltaXRpdmVOdW1iZXIoRXhlY1N0YXRlKiwgZG91Ymxl JiBudW1iZXIsIEpTVmFsdWUmKTsKICAgICAgICAgdmlydHVhbCBib29sIHRvQm9vbGVhbihFeGVj U3RhdGUqKSBjb25zdDsKICAgICAgICAgdmlydHVhbCBkb3VibGUgdG9OdW1iZXIoRXhlY1N0YXRl KikgY29uc3Q7CkBAIC0yODYsMTEgKzI4Niw2IEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgfQogCi0gICAgaW5saW5lIEpTVmFsdWUgSlNWYWx1ZTo6dG9Qcmlt aXRpdmUoRXhlY1N0YXRlKiBleGVjLCBQcmVmZXJyZWRQcmltaXRpdmVUeXBlIHByZWZlcnJlZFR5 cGUpIGNvbnN0Ci0gICAgewotICAgICAgICByZXR1cm4gaXNDZWxsKCkgPyBhc0NlbGwoKS0+dG9Q cmltaXRpdmUoZXhlYywgcHJlZmVycmVkVHlwZSkgOiBhc1ZhbHVlKCk7Ci0gICAgfQotCiAgICAg aW5saW5lIGJvb2wgSlNWYWx1ZTo6Z2V0UHJpbWl0aXZlTnVtYmVyKEV4ZWNTdGF0ZSogZXhlYywg ZG91YmxlJiBudW1iZXIsIEpTVmFsdWUmIHZhbHVlKQogICAgIHsKICAgICAgICAgaWYgKGlzSW50 MzIoKSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNOb3RB bk9iamVjdC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU05vdEFuT2JqZWN0 LmNwcAppbmRleCA1Zjk0OGY0Mzk1ZGZmMWUyZjNiNzllMTE2NTkyZjkzZjIyNTE0NGEwLi4wM2I2 N2Q1ZjNkNDMxZDkzZTFjOTZlNGMxNWIxN2VhOTVlYzY0ZTZlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9KU05vdEFuT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9KU05vdEFuT2JqZWN0LmNwcApAQCAtMzcsNyArMzcsNyBAQCBu YW1lc3BhY2UgSlNDIHsKIEFTU0VSVF9DTEFTU19GSVRTX0lOX0NFTEwoSlNOb3RBbk9iamVjdCk7 CiAKIC8vIEpTVmFsdWUgbWV0aG9kcwotSlNWYWx1ZSBKU05vdEFuT2JqZWN0Ojp0b1ByaW1pdGl2 ZShFeGVjU3RhdGUqIGV4ZWMsIFByZWZlcnJlZFByaW1pdGl2ZVR5cGUpIGNvbnN0CitKU1ZhbHVl IEpTTm90QW5PYmplY3Q6OmRlZmF1bHRWYWx1ZShFeGVjU3RhdGUqIGV4ZWMsIFByZWZlcnJlZFBy aW1pdGl2ZVR5cGUpIGNvbnN0CiB7CiAgICAgQVNTRVJUX1VOVVNFRChleGVjLCBleGVjLT5oYWRF eGNlcHRpb24oKSk7CiAgICAgcmV0dXJuIGpzTnVtYmVyKDApOwpkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNOb3RBbk9iamVjdC5oIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNOb3RBbk9iamVjdC5oCmluZGV4IDIxZmU0MjkxNmJhYTY0ZTIyMDMx YTM1NWU0YWFlZDJhOWFlNDg5MWIuLjdjOGU2M2MwYmZiYmEwMDg5Mzc4Y2JkMTJkOTczNTE1YWU3 ZmI1NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTm90QW5P YmplY3QuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU05vdEFuT2JqZWN0 LmgKQEAgLTYzLDcgKzYzLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIHN0YXRpYyBjb25z dCB1bnNpZ25lZCBTdHJ1Y3R1cmVGbGFncyA9IE92ZXJyaWRlc0dldE93blByb3BlcnR5U2xvdCB8 IE92ZXJyaWRlc0dldFByb3BlcnR5TmFtZXMgfCBKU09iamVjdDo6U3RydWN0dXJlRmxhZ3M7CiAK ICAgICAgICAgLy8gSlNWYWx1ZSBtZXRob2RzCi0gICAgICAgIHZpcnR1YWwgSlNWYWx1ZSB0b1By aW1pdGl2ZShFeGVjU3RhdGUqLCBQcmVmZXJyZWRQcmltaXRpdmVUeXBlKSBjb25zdDsKKyAgICAg ICAgdmlydHVhbCBKU1ZhbHVlIGRlZmF1bHRWYWx1ZShFeGVjU3RhdGUqLCBQcmVmZXJyZWRQcmlt aXRpdmVUeXBlKSBjb25zdDsKICAgICAgICAgdmlydHVhbCBib29sIGdldFByaW1pdGl2ZU51bWJl cihFeGVjU3RhdGUqLCBkb3VibGUmIG51bWJlciwgSlNWYWx1ZSYpOwogICAgICAgICB2aXJ0dWFs IGJvb2wgdG9Cb29sZWFuKEV4ZWNTdGF0ZSopIGNvbnN0OwogICAgICAgICB2aXJ0dWFsIGRvdWJs ZSB0b051bWJlcihFeGVjU3RhdGUqKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9KU09iamVjdC5oCmluZGV4IDc3NGVkOTZkZjVjOWQzNTYyZWExNTAzZDAxOWY2ZjU2MTZhOTli ZDIuLjlhYTg4ODFlZDFmNjc3ZDQ2NzVkYzI0NGI0NzM3ZTk1ZjkwZTFmMDcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmgKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuaApAQCAtMTMyLDcgKzEzMiw3IEBAIG5hbWVz cGFjZSBKU0MgewogICAgICAgICB2aXJ0dWFsIHZvaWQgZ2V0UHJvcGVydHlOYW1lcyhFeGVjU3Rh dGUqLCBQcm9wZXJ0eU5hbWVBcnJheSYsIEVudW1lcmF0aW9uTW9kZSBtb2RlID0gRXhjbHVkZURv bnRFbnVtUHJvcGVydGllcyk7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBnZXRPd25Qcm9wZXJ0eU5h bWVzKEV4ZWNTdGF0ZSosIFByb3BlcnR5TmFtZUFycmF5JiwgRW51bWVyYXRpb25Nb2RlIG1vZGUg PSBFeGNsdWRlRG9udEVudW1Qcm9wZXJ0aWVzKTsKIAotICAgICAgICB2aXJ0dWFsIEpTVmFsdWUg dG9QcmltaXRpdmUoRXhlY1N0YXRlKiwgUHJlZmVycmVkUHJpbWl0aXZlVHlwZSA9IE5vUHJlZmVy ZW5jZSkgY29uc3Q7CisgICAgICAgIEpTVmFsdWUgdG9QcmltaXRpdmUoRXhlY1N0YXRlKiwgUHJl ZmVycmVkUHJpbWl0aXZlVHlwZSA9IE5vUHJlZmVyZW5jZSkgY29uc3Q7CiAgICAgICAgIHZpcnR1 YWwgYm9vbCBnZXRQcmltaXRpdmVOdW1iZXIoRXhlY1N0YXRlKiwgZG91YmxlJiBudW1iZXIsIEpT VmFsdWUmIHZhbHVlKTsKICAgICAgICAgdmlydHVhbCBib29sIHRvQm9vbGVhbihFeGVjU3RhdGUq KSBjb25zdDsKICAgICAgICAgdmlydHVhbCBkb3VibGUgdG9OdW1iZXIoRXhlY1N0YXRlKikgY29u c3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1N0cmluZy5o IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNTdHJpbmcuaAppbmRleCA3YjBkY2Uy ZjYyY2M0N2NjNWZiMzY2MzIzZmZjZGRhODU2ODJiMzhhLi42MjM3ZjhkYTJiZTg4YThlZGEwYWE5 YTEyNDE0NTNjODgxYjZiZDc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9KU1N0cmluZy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTU3Ry aW5nLmgKQEAgLTQyNiw2ICs0MjYsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgfQogICAg ICAgICB1bnNpZ25lZCBsZW5ndGgoKSB7IHJldHVybiBtX2xlbmd0aDsgfQogCisgICAgICAgIEpT VmFsdWUgdG9QcmltaXRpdmUoRXhlY1N0YXRlKiwgUHJlZmVycmVkUHJpbWl0aXZlVHlwZSkgY29u c3Q7CiAgICAgICAgIGJvb2wgZ2V0U3RyaW5nUHJvcGVydHlTbG90KEV4ZWNTdGF0ZSosIGNvbnN0 IElkZW50aWZpZXImIHByb3BlcnR5TmFtZSwgUHJvcGVydHlTbG90Jik7CiAgICAgICAgIGJvb2wg Z2V0U3RyaW5nUHJvcGVydHlTbG90KEV4ZWNTdGF0ZSosIHVuc2lnbmVkIHByb3BlcnR5TmFtZSwg UHJvcGVydHlTbG90Jik7CiAgICAgICAgIGJvb2wgZ2V0U3RyaW5nUHJvcGVydHlEZXNjcmlwdG9y KEV4ZWNTdGF0ZSosIGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5TmFtZSwgUHJvcGVydHlEZXNj cmlwdG9yJik7CkBAIC00OTIsNyArNDkzLDYgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgICAg ICB9CiAgICAgICAgIH0KIAotICAgICAgICB2aXJ0dWFsIEpTVmFsdWUgdG9QcmltaXRpdmUoRXhl Y1N0YXRlKiwgUHJlZmVycmVkUHJpbWl0aXZlVHlwZSkgY29uc3Q7CiAgICAgICAgIHZpcnR1YWwg Ym9vbCBnZXRQcmltaXRpdmVOdW1iZXIoRXhlY1N0YXRlKiwgZG91YmxlJiBudW1iZXIsIEpTVmFs dWUmIHZhbHVlKTsKICAgICAgICAgdmlydHVhbCBib29sIHRvQm9vbGVhbihFeGVjU3RhdGUqKSBj b25zdDsKICAgICAgICAgdmlydHVhbCBkb3VibGUgdG9OdW1iZXIoRXhlY1N0YXRlKikgY29uc3Q7 CkBAIC02ODIsNiArNjgyLDEzIEBAIG5hbWVzcGFjZSBKU0MgewogCiAgICAgLy8gLS0tIEpTVmFs dWUgaW5saW5lcyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKKyAgICBpbmxpbmUgSlNW YWx1ZSBKU1ZhbHVlOjp0b1ByaW1pdGl2ZShFeGVjU3RhdGUqIGV4ZWMsIFByZWZlcnJlZFByaW1p dGl2ZVR5cGUgcHJlZmVycmVkVHlwZSkgY29uc3QKKyAgICB7CisgICAgICAgIGlmICghaXNDZWxs KCkpCisgICAgICAgICAgICByZXR1cm4gYXNWYWx1ZSgpOworICAgICAgICByZXR1cm4gYXNDZWxs KCktPnRvUHJpbWl0aXZlKGV4ZWMsIHByZWZlcnJlZFR5cGUpOworICAgIH0KKwogICAgIGlubGlu ZSBVU3RyaW5nIEpTVmFsdWU6OnRvU3RyaW5nKEV4ZWNTdGF0ZSogZXhlYykgY29uc3QKICAgICB7 CiAgICAgICAgIGlmIChpc1N0cmluZygpKQo= 107922 2011-09-19 15:01:42 -0700 2011-09-19 21:32:18 -0700 Patch bug-67875-20110919150141.patch text/plain 7781 mhahnenberg U3VidmVyc2lvbiBSZXZpc2lvbjogOTU0NzYKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGUy ZTk2ZjI3ZTViOTkyN2U5NmI5Mzk3MzQxYzY0NmZlYjkxZDEyMjkuLmY0YmVlMjI0ZjJkMTAwZDUy YWFmMjZiZjU0ZDFmNTY0M2EyNTFjYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDMwIEBACisyMDExLTA5LTE5ICBNYXJrIEhhaG5lbmJlcmcgIDxtaGFobmVuYmVyZ0BhcHBs ZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHRvUHJpbWl0aXZlIGZyb20gSlNDZWxsCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Nzg3NQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhcnQgb2YgdGhlIHJlZmFj dG9yaW5nIHByb2Nlc3MgdG8gdW4tdmlydHVhbGl6ZSBKU0NlbGwuICBXZSBtb3ZlIAorICAgICAg ICBhbGwgb2YgdGhlIGltcGxpY2l0IGZ1bmN0aW9uYWxpdHkgcHJvdmlkZWQgYnkgdGhlIHZpcnR1 YWwgdG9QcmltaXRpdmUgbWV0aG9kIAorICAgICAgICBpbiBKU0NlbGwgdG8gYmUgZXhwbGljaXQg aW4gSlNWYWx1ZTo6dG9QcmltaXRpdmUgYW5kIEpTQ2VsbDp0b1ByaW1pdGl2ZSB3aGlsZSAKKyAg ICAgICAgYWxzbyBkZS12aXJ0dWFsaXppbmcgSlNDZWxsOjp0b1ByaW1pdGl2ZS4KKworICAgICAg ICAqIEphdmFTY3JpcHRDb3JlLnZjcHJvai9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5k ZWY6CisgICAgICAgICogcnVudGltZS9KU0NlbGwuY3BwOgorICAgICAgICAoSlNDOjpKU0NlbGw6 OnRvUHJpbWl0aXZlKToKKyAgICAgICAgKiBydW50aW1lL0pTQ2VsbC5oOgorCisgICAgICAgIFdl IHJlcGxhY2UgSlNOb3RBbk9iamVjdDo6dG9QcmltaXRpdmUgd2l0aCBkZWZhdWx0VmFsdWUsIHdo aWNoIGl0IG92ZXJyaWRlcyBmcm9tIAorICAgICAgICBKU09iamVjdC4gIFRoaXMgcHVzaGVzIHRo ZSB2aXJ0dWFsIG1ldGhvZCBmdXJ0aGVyIGRvd24sIGVuYWJsaW5nIHVzIHRvIGdldCByaWQgCisg ICAgICAgIG9mIHRoZSB2aXJ0dWFsIGNhbGwgaW4gSlNDZWxsLiAgRXZlbnR1YWxseSB3ZSdsbCBw cm9iYWJseSBoYXZlIHRvIGRlYWwgd2l0aCB0aGlzCisgICAgICAgIGFnYWluLCBidXQgd2UnbGwg Y3Jvc3MgdGhhdCBicmlkZ2Ugd2hlbiB3ZSBjb21lIHRvIGl0LgorICAgICAgICAqIHJ1bnRpbWUv SlNOb3RBbk9iamVjdC5jcHA6CisgICAgICAgIChKU0M6OkpTTm90QW5PYmplY3Q6OmRlZmF1bHRW YWx1ZSk6CisgICAgICAgICogcnVudGltZS9KU05vdEFuT2JqZWN0Lmg6CisgICAgICAgICogcnVu dGltZS9KU09iamVjdC5oOgorICAgICAgICAqIHJ1bnRpbWUvSlNTdHJpbmcuaDoKKwogMjAxMS0w OS0xOSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjk1NDY2LgpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLnZjcHJvai9KYXZhU2NyaXB0Q29yZS9KYXZhU2Ny aXB0Q29yZS5kZWYgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUudmNwcm9q L0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmRlZgppbmRleCA4NWExNTdmZmEyNGJlNmM5 NGRjYjc1ZDNiZThiOTE1OWMzOGE0ODQ2Li43NjNkZDAwOWQwNTNjZDk5MjE1NTU2ZGY3N2JhZjk1 YzM2NDBhYmViIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENv cmUudmNwcm9qL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmRlZgorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUudmNwcm9qL0phdmFTY3JpcHRDb3JlL0phdmFT Y3JpcHRDb3JlLmRlZgpAQCAtMzU2LDggKzM1Niw2IEBAIEVYUE9SVFMKICAgICA/dG9PYmplY3RA SlNDZWxsQEpTQ0BAVUJFUEFWSlNPYmplY3RAMkBQQVZFeGVjU3RhdGVAMkBQQVZKU0dsb2JhbE9i amVjdEAyQEBaCiAgICAgP3RvT2JqZWN0QEpTT2JqZWN0QEpTQ0BAVUJFUEFWMTJAUEFWRXhlY1N0 YXRlQDJAUEFWSlNHbG9iYWxPYmplY3RAMkBAWgogICAgID90b09iamVjdFNsb3dDYXNlQEpTVmFs dWVASlNDQEBBQkVQQVZKU09iamVjdEAyQFBBVkV4ZWNTdGF0ZUAyQFBBVkpTR2xvYmFsT2JqZWN0 QDJAQFoKLSAgICA/dG9QcmltaXRpdmVASlNDZWxsQEpTQ0BAVUJFP0FWSlNWYWx1ZUAyQFBBVkV4 ZWNTdGF0ZUAyQFc0UHJlZmVycmVkUHJpbWl0aXZlVHlwZUAyQEBaCi0gICAgP3RvUHJpbWl0aXZl QEpTU3RyaW5nQEpTQ0BARUJFP0FWSlNWYWx1ZUAyQFBBVkV4ZWNTdGF0ZUAyQFc0UHJlZmVycmVk UHJpbWl0aXZlVHlwZUAyQEBaCiAgICAgP3RvU3RyaWN0VGhpc09iamVjdEBKU09iamVjdEBKU0NA QFVCRT9BVkpTVmFsdWVAMkBQQVZFeGVjU3RhdGVAMkBAWgogICAgID90b1N0cmluZ0BKU0NlbGxA SlNDQEBVQkU/QVZVU3RyaW5nQDJAUEFWRXhlY1N0YXRlQDJAQFoKICAgICA/dG9TdHJpbmdASlNP YmplY3RASlNDQEBVQkU/QVZVU3RyaW5nQDJAUEFWRXhlY1N0YXRlQDJAQFoKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQ2VsbC5jcHAgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9KU0NlbGwuY3BwCmluZGV4IDlhOTNjNTkyMDVjYzNiNTEwNWI2OGVm NjYxNzA1MjA3ODQyZTkzMjMuLmYxMTJjYzQ4YzZjY2UwZTBiYzkwM2ExMmFlMzQzNTljODBhMDYy ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTQ2VsbC5jcHAK KysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNDZWxsLmNwcApAQCAtMTE3LDEw ICsxMTcsMTEgQEAgSlNWYWx1ZSBKU0NlbGw6OmdldEpTTnVtYmVyKCkKICAgICByZXR1cm4gSlNW YWx1ZSgpOwogfQogCi1KU1ZhbHVlIEpTQ2VsbDo6dG9QcmltaXRpdmUoRXhlY1N0YXRlKiwgUHJl ZmVycmVkUHJpbWl0aXZlVHlwZSkgY29uc3QKK0pTVmFsdWUgSlNDZWxsOjp0b1ByaW1pdGl2ZShF eGVjU3RhdGUqIGV4ZWMsIFByZWZlcnJlZFByaW1pdGl2ZVR5cGUgcHJlZmVycmVkVHlwZSkgY29u c3QKIHsKLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4gSlNWYWx1ZSgpOwor ICAgIGlmIChpc1N0cmluZygpKQorICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8Y29uc3QgSlNT dHJpbmcqPih0aGlzKS0+dG9QcmltaXRpdmUoZXhlYywgcHJlZmVycmVkVHlwZSk7CisgICAgcmV0 dXJuIHN0YXRpY19jYXN0PGNvbnN0IEpTT2JqZWN0Kj4odGhpcyktPnRvUHJpbWl0aXZlKGV4ZWMs IHByZWZlcnJlZFR5cGUpOwogfQogCiBib29sIEpTQ2VsbDo6Z2V0UHJpbWl0aXZlTnVtYmVyKEV4 ZWNTdGF0ZSosIGRvdWJsZSYsIEpTVmFsdWUmKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNDZWxsLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9K U0NlbGwuaAppbmRleCBmZDAyNjYyMzNlMzI0MmU5NzkzZWViMjc5YzRjMzgyODg3MTgwOWNhLi4x YmYyNjEyZDE2NGRmNmQ2MDhkNDMyYWU2Y2YyNDQxZThiZGMzOTJkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0NlbGwuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9KU0NlbGwuaApAQCAtMTAyLDcgKzEwMiw3IEBAIG5hbWVzcGFjZSBKU0Mg ewogICAgICAgICB2aXJ0dWFsIENvbnN0cnVjdFR5cGUgZ2V0Q29uc3RydWN0RGF0YShDb25zdHJ1 Y3REYXRhJik7CiAKICAgICAgICAgLy8gQmFzaWMgY29udmVyc2lvbnMuCi0gICAgICAgIHZpcnR1 YWwgSlNWYWx1ZSB0b1ByaW1pdGl2ZShFeGVjU3RhdGUqLCBQcmVmZXJyZWRQcmltaXRpdmVUeXBl KSBjb25zdDsKKyAgICAgICAgSlNWYWx1ZSB0b1ByaW1pdGl2ZShFeGVjU3RhdGUqLCBQcmVmZXJy ZWRQcmltaXRpdmVUeXBlKSBjb25zdDsKICAgICAgICAgdmlydHVhbCBib29sIGdldFByaW1pdGl2 ZU51bWJlcihFeGVjU3RhdGUqLCBkb3VibGUmIG51bWJlciwgSlNWYWx1ZSYpOwogICAgICAgICB2 aXJ0dWFsIGJvb2wgdG9Cb29sZWFuKEV4ZWNTdGF0ZSopIGNvbnN0OwogICAgICAgICB2aXJ0dWFs IGRvdWJsZSB0b051bWJlcihFeGVjU3RhdGUqKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTm90QW5PYmplY3QuY3BwIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNOb3RBbk9iamVjdC5jcHAKaW5kZXggNWY5NDhmNDM5NWRmZjFlMmYz Yjc5ZTExNjU5MmY5M2YyMjUxNDRhMC4uMDNiNjdkNWYzZDQzMWQ5M2UxYzk2ZTRjMTViMTdlYTk1 ZWM2NGU2ZSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNOb3RB bk9iamVjdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNOb3RBbk9i amVjdC5jcHAKQEAgLTM3LDcgKzM3LDcgQEAgbmFtZXNwYWNlIEpTQyB7CiBBU1NFUlRfQ0xBU1Nf RklUU19JTl9DRUxMKEpTTm90QW5PYmplY3QpOwogCiAvLyBKU1ZhbHVlIG1ldGhvZHMKLUpTVmFs dWUgSlNOb3RBbk9iamVjdDo6dG9QcmltaXRpdmUoRXhlY1N0YXRlKiBleGVjLCBQcmVmZXJyZWRQ cmltaXRpdmVUeXBlKSBjb25zdAorSlNWYWx1ZSBKU05vdEFuT2JqZWN0OjpkZWZhdWx0VmFsdWUo RXhlY1N0YXRlKiBleGVjLCBQcmVmZXJyZWRQcmltaXRpdmVUeXBlKSBjb25zdAogewogICAgIEFT U0VSVF9VTlVTRUQoZXhlYywgZXhlYy0+aGFkRXhjZXB0aW9uKCkpOwogICAgIHJldHVybiBqc051 bWJlcigwKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTm90 QW5PYmplY3QuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTm90QW5PYmplY3Qu aAppbmRleCAyMWZlNDI5MTZiYWE2NGUyMjAzMWEzNTVlNGFhZWQyYTlhZTQ4OTFiLi43YzhlNjNj MGJmYmJhMDA4OTM3OGNiZDEyZDk3MzUxNWFlN2ZiNTU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9KU05vdEFuT2JqZWN0LmgKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSlNOb3RBbk9iamVjdC5oCkBAIC02Myw3ICs2Myw3IEBAIG5hbWVzcGFj ZSBKU0MgewogICAgICAgICBzdGF0aWMgY29uc3QgdW5zaWduZWQgU3RydWN0dXJlRmxhZ3MgPSBP dmVycmlkZXNHZXRPd25Qcm9wZXJ0eVNsb3QgfCBPdmVycmlkZXNHZXRQcm9wZXJ0eU5hbWVzIHwg SlNPYmplY3Q6OlN0cnVjdHVyZUZsYWdzOwogCiAgICAgICAgIC8vIEpTVmFsdWUgbWV0aG9kcwot ICAgICAgICB2aXJ0dWFsIEpTVmFsdWUgdG9QcmltaXRpdmUoRXhlY1N0YXRlKiwgUHJlZmVycmVk UHJpbWl0aXZlVHlwZSkgY29uc3Q7CisgICAgICAgIHZpcnR1YWwgSlNWYWx1ZSBkZWZhdWx0VmFs dWUoRXhlY1N0YXRlKiwgUHJlZmVycmVkUHJpbWl0aXZlVHlwZSkgY29uc3Q7CiAgICAgICAgIHZp cnR1YWwgYm9vbCBnZXRQcmltaXRpdmVOdW1iZXIoRXhlY1N0YXRlKiwgZG91YmxlJiBudW1iZXIs IEpTVmFsdWUmKTsKICAgICAgICAgdmlydHVhbCBib29sIHRvQm9vbGVhbihFeGVjU3RhdGUqKSBj b25zdDsKICAgICAgICAgdmlydHVhbCBkb3VibGUgdG9OdW1iZXIoRXhlY1N0YXRlKikgY29uc3Q7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5oIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNPYmplY3QuaAppbmRleCBmMWEyMTdiNTUw NjQ1ZWI2YjU4NGZkOTExOGYzMGVlMmZlODBmNDQ2Li4zYjk4YzM4MWM3NDFjOGU4ZGQ1MzcwMWRj MjZmYjE0YTVkZDAyYTQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9KU09iamVjdC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0 LmgKQEAgLTEzMiw3ICsxMzIsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAgICAgdmlydHVhbCB2 b2lkIGdldFByb3BlcnR5TmFtZXMoRXhlY1N0YXRlKiwgUHJvcGVydHlOYW1lQXJyYXkmLCBFbnVt ZXJhdGlvbk1vZGUgbW9kZSA9IEV4Y2x1ZGVEb250RW51bVByb3BlcnRpZXMpOwogICAgICAgICB2 aXJ0dWFsIHZvaWQgZ2V0T3duUHJvcGVydHlOYW1lcyhFeGVjU3RhdGUqLCBQcm9wZXJ0eU5hbWVB cnJheSYsIEVudW1lcmF0aW9uTW9kZSBtb2RlID0gRXhjbHVkZURvbnRFbnVtUHJvcGVydGllcyk7 CiAKLSAgICAgICAgdmlydHVhbCBKU1ZhbHVlIHRvUHJpbWl0aXZlKEV4ZWNTdGF0ZSosIFByZWZl cnJlZFByaW1pdGl2ZVR5cGUgPSBOb1ByZWZlcmVuY2UpIGNvbnN0OworICAgICAgICBKU1ZhbHVl IHRvUHJpbWl0aXZlKEV4ZWNTdGF0ZSosIFByZWZlcnJlZFByaW1pdGl2ZVR5cGUgPSBOb1ByZWZl cmVuY2UpIGNvbnN0OwogICAgICAgICB2aXJ0dWFsIGJvb2wgZ2V0UHJpbWl0aXZlTnVtYmVyKEV4 ZWNTdGF0ZSosIGRvdWJsZSYgbnVtYmVyLCBKU1ZhbHVlJiB2YWx1ZSk7CiAgICAgICAgIHZpcnR1 YWwgYm9vbCB0b0Jvb2xlYW4oRXhlY1N0YXRlKikgY29uc3Q7CiAgICAgICAgIHZpcnR1YWwgZG91 YmxlIHRvTnVtYmVyKEV4ZWNTdGF0ZSopIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvSlNTdHJpbmcuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0pTU3RyaW5nLmgKaW5kZXggN2IwZGNlMmY2MmNjNDdjYzVmYjM2NjMyM2ZmY2RkYTg1Njgy YjM4YS4uODFmYzRlMTlmNzQ1YTFmM2RjN2ZjNzc5Njk4YjFlOWZmYTY4YTFiNCAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNTdHJpbmcuaAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9KU1N0cmluZy5oCkBAIC00MjYsNiArNDI2LDcgQEAgbmFt ZXNwYWNlIEpTQyB7CiAgICAgICAgIH0KICAgICAgICAgdW5zaWduZWQgbGVuZ3RoKCkgeyByZXR1 cm4gbV9sZW5ndGg7IH0KIAorICAgICAgICBKU1ZhbHVlIHRvUHJpbWl0aXZlKEV4ZWNTdGF0ZSos IFByZWZlcnJlZFByaW1pdGl2ZVR5cGUpIGNvbnN0OwogICAgICAgICBib29sIGdldFN0cmluZ1By b3BlcnR5U2xvdChFeGVjU3RhdGUqLCBjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIFBy b3BlcnR5U2xvdCYpOwogICAgICAgICBib29sIGdldFN0cmluZ1Byb3BlcnR5U2xvdChFeGVjU3Rh dGUqLCB1bnNpZ25lZCBwcm9wZXJ0eU5hbWUsIFByb3BlcnR5U2xvdCYpOwogICAgICAgICBib29s IGdldFN0cmluZ1Byb3BlcnR5RGVzY3JpcHRvcihFeGVjU3RhdGUqLCBjb25zdCBJZGVudGlmaWVy JiBwcm9wZXJ0eU5hbWUsIFByb3BlcnR5RGVzY3JpcHRvciYpOwpAQCAtNDkyLDcgKzQ5Myw2IEBA IG5hbWVzcGFjZSBKU0MgewogICAgICAgICAgICAgfQogICAgICAgICB9CiAKLSAgICAgICAgdmly dHVhbCBKU1ZhbHVlIHRvUHJpbWl0aXZlKEV4ZWNTdGF0ZSosIFByZWZlcnJlZFByaW1pdGl2ZVR5 cGUpIGNvbnN0OwogICAgICAgICB2aXJ0dWFsIGJvb2wgZ2V0UHJpbWl0aXZlTnVtYmVyKEV4ZWNT dGF0ZSosIGRvdWJsZSYgbnVtYmVyLCBKU1ZhbHVlJiB2YWx1ZSk7CiAgICAgICAgIHZpcnR1YWwg Ym9vbCB0b0Jvb2xlYW4oRXhlY1N0YXRlKikgY29uc3Q7CiAgICAgICAgIHZpcnR1YWwgZG91Ymxl IHRvTnVtYmVyKEV4ZWNTdGF0ZSopIGNvbnN0Owo=