13511 2007-04-26 14:06:48 -0700 REGRESSION: Crash visiting a page 2007-04-26 17:50:40 -0700 1 1 1 Unclassified WebKit New Bugs 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED http://www.markschenk.com/cssexp/publication/article.xml Regression P1 Normal --- 1 jonathanjohnsson hyatt oldest_to_newest 12383 0 jonathanjohnsson 2007-04-26 14:06:48 -0700 WebKit crashes on http://www.markschenk.com/cssexp/publication/article.xml, released Safari doesn't. I built it yesterday, don't remember what revision it was. 12384 1 beidson 2007-04-26 14:12:22 -0700 Revision 21121 0 com.apple.WebCore 0x0147c44d WebCore::StringImpl::length() const + 9 (StringImpl.h:72) 1 com.apple.WebCore 0x014fb7b8 WebCore::RenderText::textLength() const + 28 (RenderText.h:68) 2 com.apple.WebCore 0x0117e8c3 WebCore::RenderText::trimmedPrefWidths(int, int&, bool&, int&, bool&, bool&, bool&, int&, int&, int&, int&, bool&) + 59 (RenderText.cpp:431) 3 com.apple.WebCore 0x0112d684 WebCore::RenderBlock::calcInlinePrefWidths() + 1488 (RenderBlock.cpp:3595) 4 com.apple.WebCore 0x0112daa3 WebCore::RenderBlock::calcPrefWidths() + 353 (RenderBlock.cpp:3254) 5 com.apple.WebCore 0x011397ab WebCore::RenderBox::minPrefWidth() const + 41 (RenderBox.cpp:176) 6 com.apple.WebCore 0x011901e8 WebCore::RenderTable::calcPrefWidths() + 200 (RenderTable.cpp:540) 7 com.apple.WebCore 0x011397dd WebCore::RenderBox::maxPrefWidth() const + 41 (RenderBox.cpp:184) 8 com.apple.WebCore 0x0118dacf WebCore::RenderTable::calcWidth() + 549 (RenderTable.cpp:253) 9 com.apple.WebCore 0x0119045f WebCore::RenderTable::layout() + 565 (RenderTable.cpp:300) 10 com.apple.WebCore 0x014fb685 WebCore::RenderObject::layoutIfNeeded() + 41 (RenderObject.h:474) 11 com.apple.WebCore 0x01133e05 WebCore::RenderBlock::layoutBlockChildren(bool) + 1461 (RenderBlock.cpp:1182) 12 com.apple.WebCore 0x01138a13 WebCore::RenderBlock::layoutBlock(bool) + 1323 (RenderBlock.cpp:566) 13 com.apple.WebCore 0x01129c22 WebCore::RenderBlock::layout() + 54 (RenderBlock.cpp:473) 14 com.apple.WebCore 0x014fb685 WebCore::RenderObject::layoutIfNeeded() + 41 (RenderObject.h:474) 15 com.apple.WebCore 0x01133e05 WebCore::RenderBlock::layoutBlockChildren(bool) + 1461 (RenderBlock.cpp:1182) 16 com.apple.WebCore 0x01138a13 WebCore::RenderBlock::layoutBlock(bool) + 1323 (RenderBlock.cpp:566) 17 com.apple.WebCore 0x01129c22 WebCore::RenderBlock::layout() + 54 (RenderBlock.cpp:473) 18 com.apple.WebCore 0x014fb685 WebCore::RenderObject::layoutIfNeeded() + 41 (RenderObject.h:474) 19 com.apple.WebCore 0x01133e05 WebCore::RenderBlock::layoutBlockChildren(bool) + 1461 (RenderBlock.cpp:1182) 20 com.apple.WebCore 0x01138a13 WebCore::RenderBlock::layoutBlock(bool) + 1323 (RenderBlock.cpp:566) 21 com.apple.WebCore 0x01129c22 WebCore::RenderBlock::layout() + 54 (RenderBlock.cpp:473) 22 com.apple.WebCore 0x014fb685 WebCore::RenderObject::layoutIfNeeded() + 41 (RenderObject.h:474) 23 com.apple.WebCore 0x01133e05 WebCore::RenderBlock::layoutBlockChildren(bool) + 1461 (RenderBlock.cpp:1182) 24 com.apple.WebCore 0x01138a13 WebCore::RenderBlock::layoutBlock(bool) + 1323 (RenderBlock.cpp:566) 25 com.apple.WebCore 0x01129c22 WebCore::RenderBlock::layout() + 54 (RenderBlock.cpp:473) 26 com.apple.WebCore 0x01143662 WebCore::RenderView::layout() + 208 (RenderView.cpp:106) 27 com.apple.WebCore 0x010c3ae1 WebCore::FrameView::layout(bool) + 1763 (FrameView.cpp:413) 28 com.apple.WebCore 0x010c3d69 WebCore::FrameView::layoutTimerFired(WebCore::Timer<WebCore::FrameView>*) + 25 (FrameView.cpp:621) 29 com.apple.WebCore 0x014cfed3 WebCore::Timer<WebCore::FrameView>::fired() + 91 (Timer.h:96) 30 com.apple.WebCore 0x011e86a6 WebCore::TimerBase::fireTimers(double, WTF::Vector<WebCore::TimerBase*, (unsigned long)0> const&) + 196 (Timer.cpp:322) 31 com.apple.WebCore 0x011e8743 WebCore::TimerBase::sharedTimerFired() + 109 (Timer.cpp:355) 32 com.apple.WebCore 0x011e7dfa WebCore::timerFired(__CFRunLoopTimer*, void*) + 22 (SharedTimerMac.cpp:47) 12385 2 hyatt 2007-04-26 14:20:23 -0700 Something going wrong with table caption min pref width. 12302 3 14214 hyatt 2007-04-26 15:56:11 -0700 Created attachment 14214 Patch to fix the problem 12281 4 hyatt 2007-04-26 17:31:21 -0700 I have a layout test for this that uses a counter inside a table caption. 12279 5 14214 hyatt 2007-04-26 17:40:41 -0700 Comment on attachment 14214 Patch to fix the problem r=me 12278 6 hyatt 2007-04-26 17:40:58 -0700 r=aroben hahah oops. 12276 7 hyatt 2007-04-26 17:50:40 -0700 Fixed. 14214 2007-04-26 15:56:11 -0700 2007-04-26 17:40:41 -0700 Patch to fix the problem patch.txt text/plain 13416 hyatt SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDIxMTIz KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMDctMDQt MjYgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBmb3IgMTM1 MTEsIGNyYXNoIG9uIGEgY291bnRlcnMgcGFnZS4gIE1ha2Ugc3VyZSB0aGF0IFJlbmRlclRleHRz CisgICAgICAgIG5ldmVyIGdldCBhIG51bGwgU3RyaW5nSW1wbC4gIEkgd291bGQgaGF2ZSBhZGRl ZCBhbiBhc3NlcnQgdGhhdCB0aGUgbGVuZ3RoCisgICAgICAgIGhhZCB0byBiZSBub256ZXJvIGFs c28sIGJ1dCB1bmZvcnR1bmF0ZWx5IGVkaXRpbmcgY3JlYXRlcyBlbXB0eSBSZW5kZXJUZXh0cwor ICAgICAgICBiZWNhdXNlIG9mIGl0cyBFZGl0aW5nVGV4dCBET00gc3ViY2xhc3MgdGhhdCBhbHdh eXMgZm9yY2VzIHJlbmRlcmVycyB0byBiZQorICAgICAgICBtYWRlLiAgSSBzdXBwb3NlIHRoZXJl IGlzIGEgZ29vZCByZWFzb24gZm9yIHRoaXMuLi4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGRvbS9DaGFyYWN0ZXJEYXRhLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNoYXJhY3RlckRhdGE6OnNldERhdGEpOgorICAgICAgICAoV2ViQ29yZTo6Q2hh cmFjdGVyRGF0YTo6YXBwZW5kRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpDaGFyYWN0ZXJEYXRh OjppbnNlcnREYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OkNoYXJhY3RlckRhdGE6OmRlbGV0ZURh dGEpOgorICAgICAgICAoV2ViQ29yZTo6Q2hhcmFjdGVyRGF0YTo6cmVwbGFjZURhdGEpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJDb3VudGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckNvdW50ZXI6OlJlbmRlckNvdW50ZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJU ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6OlJlbmRlclRleHQpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dDo6dHJpbW1lZFByZWZXaWR0aHMpOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyVGV4dDo6c2V0VGV4dFdpdGhPZmZzZXQpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVGV4dDo6c2V0VGV4dEludGVybmFsKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRleHQ6OnNldFRleHQpOgorCiAyMDA3LTA0LTI2ICBKdXN0aW4gR2FyY2lhICA8anVzdGluLmdh cmNpYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgb2xpdmVyCkluZGV4OiBkb20v Q2hhcmFjdGVyRGF0YS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gZG9tL0NoYXJhY3RlckRhdGEuY3BwCShy ZXZpc2lvbiAyMTEwOCkKKysrIGRvbS9DaGFyYWN0ZXJEYXRhLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNzIsMTIgKzcyLDEwIEBAIHZvaWQgQ2hhcmFjdGVyRGF0YTo6c2V0RGF0YSggY29uc3QgU3Ry aW4KICAgICBpZiAoc3RyKQogICAgICAgICBzdHItPnJlZigpOwogICAgIAotICAgIGlmICghcmVu ZGVyZXIoKSAmJiBhdHRhY2hlZCgpKSB7CisgICAgaWYgKCghcmVuZGVyZXIoKSB8fCAhcmVuZGVy ZXJJc05lZWRlZChyZW5kZXJlcigpLT5zdHlsZSgpKSkgJiYgYXR0YWNoZWQoKSkgewogICAgICAg ICBkZXRhY2goKTsKICAgICAgICAgYXR0YWNoKCk7Ci0gICAgfQotICAgIAotICAgIGlmIChyZW5k ZXJlcigpKQorICAgIH0gZWxzZSBpZiAocmVuZGVyZXIoKSkKICAgICAgICAgc3RhdGljX2Nhc3Q8 UmVuZGVyVGV4dCo+KHJlbmRlcmVyKCkpLT5zZXRUZXh0KHN0cik7CiAgICAgCiAgICAgZGlzcGF0 Y2hNb2RpZmllZEV2ZW50KG9sZFN0cik7CkBAIC0xMTYsMTIgKzExNCwxMCBAQCB2b2lkIENoYXJh Y3RlckRhdGE6OmFwcGVuZERhdGEoIGNvbnN0IFN0CiAgICAgc3RyLT5yZWYoKTsKICAgICBzdHIt PmFwcGVuZChhcmcuaW1wbCgpKTsKIAotICAgIGlmICghcmVuZGVyZXIoKSAmJiBhdHRhY2hlZCgp KSB7CisgICAgaWYgKCghcmVuZGVyZXIoKSB8fCAhcmVuZGVyZXJJc05lZWRlZChyZW5kZXJlcigp LT5zdHlsZSgpKSkgJiYgYXR0YWNoZWQoKSkgewogICAgICAgICBkZXRhY2goKTsKICAgICAgICAg YXR0YWNoKCk7Ci0gICAgfQotCi0gICAgaWYgKHJlbmRlcmVyKCkpCisgICAgfSBlbHNlIGlmIChy ZW5kZXJlcigpKQogICAgICAgICBzdGF0aWNfY2FzdDxSZW5kZXJUZXh0Kj4ocmVuZGVyZXIoKSkt PnNldFRleHRXaXRoT2Zmc2V0KHN0ciwgb2xkU3RyLT5sZW5ndGgoKSwgMCk7CiAgICAgCiAgICAg ZGlzcGF0Y2hNb2RpZmllZEV2ZW50KG9sZFN0cik7CkBAIC0xNDAsMTIgKzEzNiwxMCBAQCB2b2lk IENoYXJhY3RlckRhdGE6Omluc2VydERhdGEoIGNvbnN0IHVuCiAgICAgc3RyLT5yZWYoKTsKICAg ICBzdHItPmluc2VydChhcmcuaW1wbCgpLCBvZmZzZXQpOwogCi0gICAgaWYgKCFyZW5kZXJlcigp ICYmIGF0dGFjaGVkKCkpIHsKKyAgICBpZiAoKCFyZW5kZXJlcigpIHx8ICFyZW5kZXJlcklzTmVl ZGVkKHJlbmRlcmVyKCktPnN0eWxlKCkpKSAmJiBhdHRhY2hlZCgpKSB7CiAgICAgICAgIGRldGFj aCgpOwogICAgICAgICBhdHRhY2goKTsKLSAgICB9Ci0KLSAgICBpZiAocmVuZGVyZXIoKSkKKyAg ICB9IGVsc2UgaWYgKHJlbmRlcmVyKCkpCiAgICAgICAgIHN0YXRpY19jYXN0PFJlbmRlclRleHQq PihyZW5kZXJlcigpKS0+c2V0VGV4dFdpdGhPZmZzZXQoc3RyLCBvZmZzZXQsIDApOwogICAgIAog ICAgIGRpc3BhdGNoTW9kaWZpZWRFdmVudChvbGRTdHIpOwpAQCAtMTY3LDkgKzE2MSwxMyBAQCB2 b2lkIENoYXJhY3RlckRhdGE6OmRlbGV0ZURhdGEoIGNvbnN0IHVuCiAgICAgc3RyID0gc3RyLT5j b3B5KCk7CiAgICAgc3RyLT5yZWYoKTsKICAgICBzdHItPnJlbW92ZShvZmZzZXQsY291bnQpOwot ICAgIGlmIChyZW5kZXJlcigpKQotICAgICAgICBzdGF0aWNfY2FzdDxSZW5kZXJUZXh0Kj4ocmVu ZGVyZXIoKSktPnNldFRleHRXaXRoT2Zmc2V0KHN0ciwgb2Zmc2V0LCBjb3VudCk7CiAgICAgCisg ICAgaWYgKCghcmVuZGVyZXIoKSB8fCAhcmVuZGVyZXJJc05lZWRlZChyZW5kZXJlcigpLT5zdHls ZSgpKSkgJiYgYXR0YWNoZWQoKSkgeworICAgICAgICBkZXRhY2goKTsKKyAgICAgICAgYXR0YWNo KCk7CisgICAgfSBlbHNlIGlmIChyZW5kZXJlcigpKQorICAgICAgICBzdGF0aWNfY2FzdDxSZW5k ZXJUZXh0Kj4ocmVuZGVyZXIoKSktPnNldFRleHRXaXRoT2Zmc2V0KHN0ciwgb2Zmc2V0LCBjb3Vu dCk7CisKICAgICBkaXNwYXRjaE1vZGlmaWVkRXZlbnQob2xkU3RyKTsKICAgICBvbGRTdHItPmRl cmVmKCk7CiAKQEAgLTE5NywxMiArMTk1LDEwIEBAIHZvaWQgQ2hhcmFjdGVyRGF0YTo6cmVwbGFj ZURhdGEoIGNvbnN0IHUKICAgICBzdHItPnJlbW92ZShvZmZzZXQscmVhbENvdW50KTsKICAgICBz dHItPmluc2VydChhcmcuaW1wbCgpLCBvZmZzZXQpOwogCi0gICAgaWYgKCFyZW5kZXJlcigpICYm IGF0dGFjaGVkKCkpIHsKKyAgICBpZiAoKCFyZW5kZXJlcigpIHx8ICFyZW5kZXJlcklzTmVlZGVk KHJlbmRlcmVyKCktPnN0eWxlKCkpKSAmJiBhdHRhY2hlZCgpKSB7CiAgICAgICAgIGRldGFjaCgp OwogICAgICAgICBhdHRhY2goKTsKLSAgICB9Ci0KLSAgICBpZiAocmVuZGVyZXIoKSkKKyAgICB9 IGVsc2UgaWYgKHJlbmRlcmVyKCkpCiAgICAgICAgIHN0YXRpY19jYXN0PFJlbmRlclRleHQqPihy ZW5kZXJlcigpKS0+c2V0VGV4dFdpdGhPZmZzZXQoc3RyLCBvZmZzZXQsIGNvdW50KTsKICAgICAK ICAgICBkaXNwYXRjaE1vZGlmaWVkRXZlbnQob2xkU3RyKTsKSW5kZXg6IHJlbmRlcmluZy9SZW5k ZXJDb3VudGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSByZW5kZXJpbmcvUmVuZGVyQ291bnRlci5jcHAJ KHJldmlzaW9uIDIxMTA4KQorKysgcmVuZGVyaW5nL1JlbmRlckNvdW50ZXIuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yMDIsNyArMjAyLDcgQEAgc3RhdGljIENvdW50ZXJOb2RlKiBjb3VudGVyKFJl bmRlck9iamVjdAogfQogCiBSZW5kZXJDb3VudGVyOjpSZW5kZXJDb3VudGVyKERvY3VtZW50KiBu b2RlLCBjb25zdCBDb3VudGVyQ29udGVudCYgY291bnRlcikKLSAgICA6IFJlbmRlclRleHQobm9k ZSwgMCkKKyAgICA6IFJlbmRlclRleHQobm9kZSwgU3RyaW5nSW1wbDo6ZW1wdHkoKSkKICAgICAs IG1fY291bnRlcihjb3VudGVyKQogICAgICwgbV9jb3VudGVyTm9kZSgwKQogewpJbmRleDogcmVu ZGVyaW5nL1JlbmRlclRleHQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHJlbmRlcmluZy9SZW5kZXJUZXh0 LmNwcAkocmV2aXNpb24gMjExMDgpCisrKyByZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTYzLDEyICs2MywxMSBAQCBSZW5kZXJUZXh0OjpSZW5kZXJUZXh0KE5vZGUq IG5vZGUsIFBhc3NSCiAgICAgICwgbV9zZWxlY3Rpb25TdGF0ZShTZWxlY3Rpb25Ob25lKQogICAg ICAsIG1fbGluZXNEaXJ0eShmYWxzZSkKICAgICAgLCBtX2NvbnRhaW5zUmV2ZXJzZWRUZXh0KGZh bHNlKQotICAgICAsIG1faXNBbGxBU0NJSShtX3RleHQgPyBjaGFyYWN0ZXJzQXJlQWxsQVNDSUko bV90ZXh0LmdldCgpKSA6IHRydWUpCisgICAgICwgbV9pc0FsbEFTQ0lJKGNoYXJhY3RlcnNBcmVB bGxBU0NJSShtX3RleHQuZ2V0KCkpKQogeworICAgIEFTU0VSVChtX3RleHQpOwogICAgIHNldFJl bmRlclRleHQoKTsKLSAgICBpZiAobV90ZXh0KQotICAgICAgICBtX3RleHQgPSBtX3RleHQtPnJl cGxhY2UoJ1xcJywgYmFja3NsYXNoQXNDdXJyZW5jeVN5bWJvbCgpKTsKLSAgICBBU1NFUlQoIW1f dGV4dCB8fCAhdGV4dExlbmd0aCgpIHx8IGNoYXJhY3RlcnMoKSk7CisgICAgbV90ZXh0ID0gbV90 ZXh0LT5yZXBsYWNlKCdcXCcsIGJhY2tzbGFzaEFzQ3VycmVuY3lTeW1ib2woKSk7CiB9CiAKIHZv aWQgUmVuZGVyVGV4dDo6c2V0U3R5bGUoUmVuZGVyU3R5bGUqIG5ld1N0eWxlKQpAQCAtNDI4LDYg KzQyNyw5IEBAIHZvaWQgUmVuZGVyVGV4dDo6dHJpbW1lZFByZWZXaWR0aHMoaW50IGwKICAgICBp ZiAoIWNvbGxhcHNlV2hpdGVTcGFjZSkKICAgICAgICAgc3RyaXBGcm9udFNwYWNlcyA9IGZhbHNl OwogCisgICAgaWYgKG1faGFzVGFiIHx8IHByZWZXaWR0aHNEaXJ0eSgpKQorICAgICAgICBjYWxj UHJlZldpZHRocyhsZWFkV2lkdGgpOworCiAgICAgaW50IGxlbiA9IHRleHRMZW5ndGgoKTsKICAg ICBpZiAoIWxlbiB8fCAoc3RyaXBGcm9udFNwYWNlcyAmJiBtX3RleHQtPmNvbnRhaW5zT25seVdo aXRlc3BhY2UoKSkpIHsKICAgICAgICAgbWF4VyA9IDA7CkBAIC00MzUsOSArNDM3LDYgQEAgdm9p ZCBSZW5kZXJUZXh0Ojp0cmltbWVkUHJlZldpZHRocyhpbnQgbAogICAgICAgICByZXR1cm47CiAg ICAgfQogCi0gICAgaWYgKG1faGFzVGFiIHx8IHByZWZXaWR0aHNEaXJ0eSgpKQotICAgICAgICBj YWxjUHJlZldpZHRocyhsZWFkV2lkdGgpOwotCiAgICAgbWluVyA9IG1fbWluV2lkdGg7CiAgICAg bWF4VyA9IG1fbWF4V2lkdGg7CiAgICAgYmVnaW5XUyA9ICFzdHJpcEZyb250U3BhY2VzICYmIG1f aGFzQmVnaW5XUzsKQEAgLTc0NCw4ICs3NDMsOCBAQCB2b2lkIFJlbmRlclRleHQ6OnNldFNlbGVj dGlvblN0YXRlKFNlbGVjCiAKIHZvaWQgUmVuZGVyVGV4dDo6c2V0VGV4dFdpdGhPZmZzZXQoUGFz c1JlZlB0cjxTdHJpbmdJbXBsPiB0ZXh0LCB1bnNpZ25lZCBvZmZzZXQsIHVuc2lnbmVkIGxlbiwg Ym9vbCBmb3JjZSkKIHsKLSAgICB1bnNpZ25lZCBvbGRMZW4gPSBtX3RleHQgPyB0ZXh0TGVuZ3Ro KCkgOiAwOwotICAgIHVuc2lnbmVkIG5ld0xlbiA9IHRleHQgPyB0ZXh0LT5sZW5ndGgoKSA6IDA7 CisgICAgdW5zaWduZWQgb2xkTGVuID0gdGV4dExlbmd0aCgpOworICAgIHVuc2lnbmVkIG5ld0xl biA9IHRleHQtPmxlbmd0aCgpOwogICAgIGludCBkZWx0YSA9IG5ld0xlbiAtIG9sZExlbjsKICAg ICB1bnNpZ25lZCBlbmQgPSBsZW4gPyBvZmZzZXQgKyBsZW4gLSAxIDogb2Zmc2V0OwogCkBAIC04 MjEsOTcgKzgyMCw5MiBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNJbmxpbmVGbG93T3JFbXB0eVRl CiAKIHZvaWQgUmVuZGVyVGV4dDo6c2V0VGV4dEludGVybmFsKFBhc3NSZWZQdHI8U3RyaW5nSW1w bD4gdGV4dCkKIHsKLSAgICBib29sIGlzQWxsQVNDSUkgPSB0cnVlOwotCiAgICAgbV90ZXh0ID0g dGV4dDsKKyAgICBBU1NFUlQobV90ZXh0KTsKIAotICAgIGlmIChtX3RleHQpIHsKLSAgICAgICAg bV90ZXh0ID0gbV90ZXh0LT5yZXBsYWNlKCdcXCcsIGJhY2tzbGFzaEFzQ3VycmVuY3lTeW1ib2wo KSk7CisgICAgbV90ZXh0ID0gbV90ZXh0LT5yZXBsYWNlKCdcXCcsIGJhY2tzbGFzaEFzQ3VycmVu Y3lTeW1ib2woKSk7CiAKICNpZiBFTkFCTEUoU1ZHKQotICAgICAgICBpZiAoaXNTVkdUZXh0KCkp IHsKLSAgICAgICAgICAgIGlmIChzdHlsZSgpICYmIHN0eWxlKCktPndoaXRlU3BhY2UoKSA9PSBQ UkUpIHsKLSAgICAgICAgICAgICAgICAvLyBTcGVjOiBXaGVuIHhtbDpzcGFjZT0icHJlc2VydmUi LCB0aGUgU1ZHIHVzZXIgYWdlbnQgd2lsbCBkbyB0aGUgZm9sbG93aW5nIHVzaW5nIGEKLSAgICAg ICAgICAgICAgICAvLyBjb3B5IG9mIHRoZSBvcmlnaW5hbCBjaGFyYWN0ZXIgZGF0YSBjb250ZW50 LiBJdCB3aWxsIGNvbnZlcnQgYWxsIG5ld2xpbmUgYW5kIHRhYgotICAgICAgICAgICAgICAgIC8v IGNoYXJhY3RlcnMgaW50byBzcGFjZSBjaGFyYWN0ZXJzLiBUaGVuLCBpdCB3aWxsIGRyYXcgYWxs IHNwYWNlIGNoYXJhY3RlcnMsIGluY2x1ZGluZwotICAgICAgICAgICAgICAgIC8vIGxlYWRpbmcs IHRyYWlsaW5nIGFuZCBtdWx0aXBsZSBjb250aWd1b3VzIHNwYWNlIGNoYXJhY3RlcnMuCi0KLSAg ICAgICAgICAgICAgICBtX3RleHQgPSBtX3RleHQtPnJlcGxhY2UoJ1xuJywgJyAnKTsKLQotICAg ICAgICAgICAgICAgIC8vIElmIHhtbDpzcGFjZT0icHJlc2VydmUiIGlzIHNldCwgd2hpdGUtc3Bh Y2UgaXMgc2V0IHRvICJwcmUiLCB3aGljaAotICAgICAgICAgICAgICAgIC8vIHByZXNlcnZlcyBs ZWFkaW5nLCB0cmFpbGluZyAmIGNvbnRpZ3VvdXMgc3BhY2UgY2hhcmFjdGVyIGZvciB1cy4KLSAg ICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAvLyBTcGVjOiBXaGVuIHhtbDpzcGFj ZT0iZGVmYXVsdCIsIHRoZSBTVkcgdXNlciBhZ2VudCB3aWxsIGRvIHRoZSBmb2xsb3dpbmcgdXNp bmcgYQotICAgICAgICAgICAgICAgIC8vIGNvcHkgb2YgdGhlIG9yaWdpbmFsIGNoYXJhY3RlciBk YXRhIGNvbnRlbnQuIEZpcnN0LCBpdCB3aWxsIHJlbW92ZSBhbGwgbmV3bGluZQotICAgICAgICAg ICAgICAgIC8vIGNoYXJhY3RlcnMuIFRoZW4gaXQgd2lsbCBjb252ZXJ0IGFsbCB0YWIgY2hhcmFj dGVycyBpbnRvIHNwYWNlIGNoYXJhY3RlcnMuCi0gICAgICAgICAgICAgICAgLy8gVGhlbiwgaXQg d2lsbCBzdHJpcCBvZmYgYWxsIGxlYWRpbmcgYW5kIHRyYWlsaW5nIHNwYWNlIGNoYXJhY3RlcnMu Ci0gICAgICAgICAgICAgICAgLy8gVGhlbiwgYWxsIGNvbnRpZ3VvdXMgc3BhY2UgY2hhcmFjdGVy cyB3aWxsIGJlIGNvbnNvbGlkYXRlZC4gICAgCi0KLSAgICAgICAgICAgICAgICBzdGF0aWMgU3Ry aW5nSW1wbCBlbXB0eSgiIiwgMCk7Ci0gICAgICAgICAgICAgICAgbV90ZXh0ID0gbV90ZXh0LT5y ZXBsYWNlKCdcbicsICZlbXB0eSk7Ci0gICAgCi0gICAgICAgICAgICAgICAgLy8gSWYgeG1sOnNw YWNlPSJkZWZhdWx0IiBpcyBzZXQsIHdoaXRlLXNwYWNlIGlzIHNldCB0byAibm93cmFwIiwgd2hp Y2ggaGFuZGxlcwotICAgICAgICAgICAgICAgIC8vIGxlYWRpbmcsIHRyYWlsaW5nICYgY29udGln dW91cyBzcGFjZSBjaGFyYWN0ZXIgcmVtb3ZhbCBmb3IgdXMuCi0gICAgICAgICAgICB9CisgICAg aWYgKGlzU1ZHVGV4dCgpKSB7CisgICAgICAgIGlmIChzdHlsZSgpICYmIHN0eWxlKCktPndoaXRl U3BhY2UoKSA9PSBQUkUpIHsKKyAgICAgICAgICAgIC8vIFNwZWM6IFdoZW4geG1sOnNwYWNlPSJw cmVzZXJ2ZSIsIHRoZSBTVkcgdXNlciBhZ2VudCB3aWxsIGRvIHRoZSBmb2xsb3dpbmcgdXNpbmcg YQorICAgICAgICAgICAgLy8gY29weSBvZiB0aGUgb3JpZ2luYWwgY2hhcmFjdGVyIGRhdGEgY29u dGVudC4gSXQgd2lsbCBjb252ZXJ0IGFsbCBuZXdsaW5lIGFuZCB0YWIKKyAgICAgICAgICAgIC8v IGNoYXJhY3RlcnMgaW50byBzcGFjZSBjaGFyYWN0ZXJzLiBUaGVuLCBpdCB3aWxsIGRyYXcgYWxs IHNwYWNlIGNoYXJhY3RlcnMsIGluY2x1ZGluZworICAgICAgICAgICAgLy8gbGVhZGluZywgdHJh aWxpbmcgYW5kIG11bHRpcGxlIGNvbnRpZ3VvdXMgc3BhY2UgY2hhcmFjdGVycy4KKworICAgICAg ICAgICAgbV90ZXh0ID0gbV90ZXh0LT5yZXBsYWNlKCdcbicsICcgJyk7CisKKyAgICAgICAgICAg IC8vIElmIHhtbDpzcGFjZT0icHJlc2VydmUiIGlzIHNldCwgd2hpdGUtc3BhY2UgaXMgc2V0IHRv ICJwcmUiLCB3aGljaAorICAgICAgICAgICAgLy8gcHJlc2VydmVzIGxlYWRpbmcsIHRyYWlsaW5n ICYgY29udGlndW91cyBzcGFjZSBjaGFyYWN0ZXIgZm9yIHVzLgorICAgICAgIH0gZWxzZSB7Cisg ICAgICAgICAgICAvLyBTcGVjOiBXaGVuIHhtbDpzcGFjZT0iZGVmYXVsdCIsIHRoZSBTVkcgdXNl ciBhZ2VudCB3aWxsIGRvIHRoZSBmb2xsb3dpbmcgdXNpbmcgYQorICAgICAgICAgICAgLy8gY29w eSBvZiB0aGUgb3JpZ2luYWwgY2hhcmFjdGVyIGRhdGEgY29udGVudC4gRmlyc3QsIGl0IHdpbGwg cmVtb3ZlIGFsbCBuZXdsaW5lCisgICAgICAgICAgICAvLyBjaGFyYWN0ZXJzLiBUaGVuIGl0IHdp bGwgY29udmVydCBhbGwgdGFiIGNoYXJhY3RlcnMgaW50byBzcGFjZSBjaGFyYWN0ZXJzLgorICAg ICAgICAgICAgLy8gVGhlbiwgaXQgd2lsbCBzdHJpcCBvZmYgYWxsIGxlYWRpbmcgYW5kIHRyYWls aW5nIHNwYWNlIGNoYXJhY3RlcnMuCisgICAgICAgICAgICAvLyBUaGVuLCBhbGwgY29udGlndW91 cyBzcGFjZSBjaGFyYWN0ZXJzIHdpbGwgYmUgY29uc29saWRhdGVkLiAgICAKKworICAgICAgICAg ICAgc3RhdGljIFN0cmluZ0ltcGwgZW1wdHkoIiIsIDApOworICAgICAgICAgICAgbV90ZXh0ID0g bV90ZXh0LT5yZXBsYWNlKCdcbicsICZlbXB0eSk7CiAKLSAgICAgICAgICAgIG1fdGV4dCA9IG1f dGV4dC0+cmVwbGFjZSgnXHQnLCAnICcpOworICAgICAgICAgICAgLy8gSWYgeG1sOnNwYWNlPSJk ZWZhdWx0IiBpcyBzZXQsIHdoaXRlLXNwYWNlIGlzIHNldCB0byAibm93cmFwIiwgd2hpY2ggaGFu ZGxlcworICAgICAgICAgICAgLy8gbGVhZGluZywgdHJhaWxpbmcgJiBjb250aWd1b3VzIHNwYWNl IGNoYXJhY3RlciByZW1vdmFsIGZvciB1cy4KICAgICAgICAgfQotI2VuZGlmCiAKLSAgICAgICAg aWYgKHN0eWxlKCkpIHsKLSAgICAgICAgICAgIHN3aXRjaCAoc3R5bGUoKS0+dGV4dFRyYW5zZm9y bSgpKSB7Ci0gICAgICAgICAgICAgICAgY2FzZSBUVE5PTkU6Ci0gICAgICAgICAgICAgICAgICAg IGJyZWFrOwotICAgICAgICAgICAgICAgIGNhc2UgQ0FQSVRBTElaRTogewotICAgICAgICAgICAg ICAgICAgICAvLyBmaW5kIHByZXZpb3VzIHRleHQgcmVuZGVyZXIgaWYgb25lIGV4aXN0cwotICAg ICAgICAgICAgICAgICAgICBSZW5kZXJPYmplY3QqIHByZXZpb3VzVGV4dCA9IHRoaXM7Ci0gICAg ICAgICAgICAgICAgICAgIHdoaWxlICgocHJldmlvdXNUZXh0ID0gcHJldmlvdXNUZXh0LT5wcmV2 aW91c0luUHJlT3JkZXIoKSkpCi0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoIWlzSW5saW5l Rmxvd09yRW1wdHlUZXh0KHByZXZpb3VzVGV4dCkpCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgICAgIFVDaGFyIHByZXZpb3VzQ2hhcmFjdGVyID0g JyAnOwotICAgICAgICAgICAgICAgICAgICBpZiAocHJldmlvdXNUZXh0ICYmIHByZXZpb3VzVGV4 dC0+aXNUZXh0KCkpCi0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoU3RyaW5nSW1wbCogcHJl dmlvdXNTdHJpbmcgPSBzdGF0aWNfY2FzdDxSZW5kZXJUZXh0Kj4ocHJldmlvdXNUZXh0KS0+dGV4 dCgpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHByZXZpb3VzQ2hhcmFjdGVyID0gKCpw cmV2aW91c1N0cmluZylbcHJldmlvdXNTdHJpbmctPmxlbmd0aCgpIC0gMV07Ci0gICAgICAgICAg ICAgICAgICAgIG1fdGV4dCA9IG1fdGV4dC0+Y2FwaXRhbGl6ZShwcmV2aW91c0NoYXJhY3Rlcik7 Ci0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAg ICAgICAgICBjYXNlIFVQUEVSQ0FTRToKLSAgICAgICAgICAgICAgICAgICAgbV90ZXh0ID0gbV90 ZXh0LT51cHBlcigpOwotICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAg ICBjYXNlIExPV0VSQ0FTRToKLSAgICAgICAgICAgICAgICAgICAgbV90ZXh0ID0gbV90ZXh0LT5s b3dlcigpOwotICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KKyAgICAg ICAgbV90ZXh0ID0gbV90ZXh0LT5yZXBsYWNlKCdcdCcsICcgJyk7CisgICAgfQorI2VuZGlmCiAK LSAgICAgICAgICAgIC8vIFdlIHVzZSB0aGUgc2FtZSBjaGFyYWN0ZXJzIGhlcmUgYXMgZm9yIGxp c3QgbWFya2Vycy4KLSAgICAgICAgICAgIC8vIFNlZSB0aGUgbGlzdE1hcmtlclRleHQgZnVuY3Rp b24gaW4gUmVuZGVyTGlzdE1hcmtlci5jcHAuCi0gICAgICAgICAgICBzd2l0Y2ggKHN0eWxlKCkt PnRleHRTZWN1cml0eSgpKSB7Ci0gICAgICAgICAgICAgICAgY2FzZSBUU05PTkU6Ci0gICAgICAg ICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIGNhc2UgVFNDSVJDTEU6Ci0gICAg ICAgICAgICAgICAgICAgIG1fdGV4dCA9IG1fdGV4dC0+c2VjdXJlKHdoaXRlQnVsbGV0KTsKLSAg ICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgY2FzZSBUU0RJU0M6Ci0g ICAgICAgICAgICAgICAgICAgIG1fdGV4dCA9IG1fdGV4dC0+c2VjdXJlKGJ1bGxldCk7Ci0gICAg ICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIGNhc2UgVFNTUVVBUkU6Ci0g ICAgICAgICAgICAgICAgICAgIG1fdGV4dCA9IG1fdGV4dC0+c2VjdXJlKGJsYWNrU3F1YXJlKTsK KyAgICBpZiAoc3R5bGUoKSkgeworICAgICAgICBzd2l0Y2ggKHN0eWxlKCktPnRleHRUcmFuc2Zv cm0oKSkgeworICAgICAgICAgICAgY2FzZSBUVE5PTkU6CisgICAgICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgICAgICBjYXNlIENBUElUQUxJWkU6IHsKKyAgICAgICAgICAgICAgICAvLyBmaW5k IHByZXZpb3VzIHRleHQgcmVuZGVyZXIgaWYgb25lIGV4aXN0cworICAgICAgICAgICAgICAgIFJl bmRlck9iamVjdCogcHJldmlvdXNUZXh0ID0gdGhpczsKKyAgICAgICAgICAgICAgICB3aGlsZSAo KHByZXZpb3VzVGV4dCA9IHByZXZpb3VzVGV4dC0+cHJldmlvdXNJblByZU9yZGVyKCkpKQorICAg ICAgICAgICAgICAgICAgICBpZiAoIWlzSW5saW5lRmxvd09yRW1wdHlUZXh0KHByZXZpb3VzVGV4 dCkpCisgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICBVQ2hh ciBwcmV2aW91c0NoYXJhY3RlciA9ICcgJzsKKyAgICAgICAgICAgICAgICBpZiAocHJldmlvdXNU ZXh0ICYmIHByZXZpb3VzVGV4dC0+aXNUZXh0KCkpCisgICAgICAgICAgICAgICAgICAgIGlmIChT dHJpbmdJbXBsKiBwcmV2aW91c1N0cmluZyA9IHN0YXRpY19jYXN0PFJlbmRlclRleHQqPihwcmV2 aW91c1RleHQpLT50ZXh0KCkpCisgICAgICAgICAgICAgICAgICAgICAgICBwcmV2aW91c0NoYXJh Y3RlciA9ICgqcHJldmlvdXNTdHJpbmcpW3ByZXZpb3VzU3RyaW5nLT5sZW5ndGgoKSAtIDFdOwor ICAgICAgICAgICAgICAgIG1fdGV4dCA9IG1fdGV4dC0+Y2FwaXRhbGl6ZShwcmV2aW91c0NoYXJh Y3Rlcik7CisgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CisgICAgICAgICAg ICBjYXNlIFVQUEVSQ0FTRToKKyAgICAgICAgICAgICAgICBtX3RleHQgPSBtX3RleHQtPnVwcGVy KCk7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIExPV0VSQ0FTRToK KyAgICAgICAgICAgICAgICBtX3RleHQgPSBtX3RleHQtPmxvd2VyKCk7CisgICAgICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgIH0KIAotICAgICAgICBpc0FsbEFTQ0lJID0gY2hhcmFjdGVyc0Fy ZUFsbEFTQ0lJKG1fdGV4dC5nZXQoKSk7CisgICAgICAgIC8vIFdlIHVzZSB0aGUgc2FtZSBjaGFy YWN0ZXJzIGhlcmUgYXMgZm9yIGxpc3QgbWFya2Vycy4KKyAgICAgICAgLy8gU2VlIHRoZSBsaXN0 TWFya2VyVGV4dCBmdW5jdGlvbiBpbiBSZW5kZXJMaXN0TWFya2VyLmNwcC4KKyAgICAgICAgc3dp dGNoIChzdHlsZSgpLT50ZXh0U2VjdXJpdHkoKSkgeworICAgICAgICAgICAgY2FzZSBUU05PTkU6 CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICBjYXNlIFRTQ0lSQ0xFOgorICAg ICAgICAgICAgICAgIG1fdGV4dCA9IG1fdGV4dC0+c2VjdXJlKHdoaXRlQnVsbGV0KTsKKyAgICAg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgVFNESVNDOgorICAgICAgICAgICAg ICAgIG1fdGV4dCA9IG1fdGV4dC0+c2VjdXJlKGJ1bGxldCk7CisgICAgICAgICAgICAgICAgYnJl YWs7CisgICAgICAgICAgICBjYXNlIFRTU1FVQVJFOgorICAgICAgICAgICAgICAgIG1fdGV4dCA9 IG1fdGV4dC0+c2VjdXJlKGJsYWNrU3F1YXJlKTsKKyAgICAgICAgfQogICAgIH0KIAotICAgIG1f aXNBbGxBU0NJSSA9IGlzQWxsQVNDSUk7Ci0KKyAgICBBU1NFUlQobV90ZXh0KTsKICAgICBBU1NF UlQoIWlzQlIoKSB8fCAodGV4dExlbmd0aCgpID09IDEgJiYgKCptX3RleHQpWzBdID09ICdcbicp KTsKLSAgICBBU1NFUlQoIXRleHRMZW5ndGgoKSB8fCBjaGFyYWN0ZXJzKCkpOworCisgICAgbV9p c0FsbEFTQ0lJID0gY2hhcmFjdGVyc0FyZUFsbEFTQ0lJKG1fdGV4dC5nZXQoKSk7CiB9CiAKIHZv aWQgUmVuZGVyVGV4dDo6c2V0VGV4dChQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IHRleHQsIGJvb2wg Zm9yY2UpCiB7Ci0gICAgaWYgKCF0ZXh0KQotICAgICAgICByZXR1cm47CisgICAgQVNTRVJUKHRl eHQpOworCiAgICAgaWYgKCFmb3JjZSAmJiBlcXVhbChtX3RleHQuZ2V0KCksIHRleHQuZ2V0KCkp KQogICAgICAgICByZXR1cm47CiAK