31275 2009-11-09 14:53:26 -0800 Fix Chromium's Posix VFS implementation by adding the required 'unused file descriptor' logic 2009-11-11 21:58:49 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dumi dumi dglazkov michaeln oldest_to_newest 161806 0 dumi 2009-11-09 14:53:26 -0800 The default SQLite VFS for Linux assumes that it might not always be able to close file descriptors. Therefore, it stores them in an "unused file descriptor" field of the sqlite3_file structure. That field is populated in the in xDlOpen() function. Ignoring that logic in Chromium's implementation resulted in a crash (dereferencing a NULL pointer). We need to fix that. 161812 1 42809 dumi 2009-11-09 15:14:31 -0800 Created attachment 42809 patch Please do not commit-queue+ this patch. I will manually commit it once the Chromium-side patch that it depends on is in. 161863 2 42809 eric 2009-11-09 17:44:29 -0800 Comment on attachment 42809 patch No need to set cq? if you don't want it commit-queued. :) You can also explicitly set cq-. 162652 3 42995 dumi 2009-11-11 13:29:05 -0800 Created attachment 42995 patch SQLite function names changed. 162703 4 43011 dumi 2009-11-11 15:25:49 -0800 Created attachment 43011 patch Function names changed once again. 162795 5 43011 dglazkov 2009-11-11 21:48:19 -0800 Comment on attachment 43011 patch wow, shess is sure giving you hard time ;) 162796 6 dumi 2009-11-11 21:58:49 -0800 Landed as r50867. 42809 2009-11-09 15:14:31 -0800 2009-11-11 13:29:05 -0800 patch patch text/plain 3196 dumi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDY5NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDktMTEtMDkgIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBGaXhpbmcgQ2hyb21pdW0ncyBQT1NJWCBWRlMgaW1wbGVtZW50YXRpb24sIGJ5IGFkZGluZyB0 aGUgcmVxdWlyZWQKKyAgICAgICAgInVzZWQgZmlsZSBkZXNjcmlwdG9ycyIgbG9naWMuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxMjc1CisKKyAg ICAgICAgKiBwbGF0Zm9ybS9zcWwvY2hyb21pdW0vU1FMaXRlRmlsZVN5c3RlbUNocm9taXVtUG9z aXguY3BwOgorCiAyMDA5LTExLTA5ICBOb3JiZXJ0IExlc2VyICA8bm9yYmVydC5sZXNlckBub2tp YS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4u CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL3NxbC9jaHJvbWl1bS9TUUxpdGVGaWxlU3lzdGVtQ2hy b21pdW1Qb3NpeC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9zcWwvY2hyb21p dW0vU1FMaXRlRmlsZVN5c3RlbUNocm9taXVtUG9zaXguY3BwCShyZXZpc2lvbiA1MDY5NikKKysr IFdlYkNvcmUvcGxhdGZvcm0vc3FsL2Nocm9taXVtL1NRTGl0ZUZpbGVTeXN0ZW1DaHJvbWl1bVBv c2l4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQsNiArNDQsOSBAQCB1c2luZyBuYW1lc3BhY2Ug V2ViQ29yZTsKIGV4dGVybiAiQyIgewogdm9pZCBpbml0VW5peEZpbGUoc3FsaXRlM19maWxlKiBm aWxlKTsKIGludCBmaWxsSW5Vbml4RmlsZShzcWxpdGUzX3ZmcyogdmZzLCBpbnQgZmQsIGludCBk aXJmZCwgc3FsaXRlM19maWxlKiBmaWxlLCBjb25zdCBjaGFyKiBmaWxlTmFtZSwgaW50IG5vTG9j ayk7CitpbnQgZ2V0UmV1c2FibGVGaWxlSGFuZGxlKHNxbGl0ZTNfZmlsZSogZmlsZSwgY29uc3Qg Y2hhciogZmlsZU5hbWUsIGludCBmbGFncywgaW50KiBmZCk7Cit2b2lkIHVwZGF0ZVJldXNhYmxl RmlsZUhhbmRsZShzcWxpdGUzX2ZpbGUqIGZpbGUsIGludCBmZCwgaW50IGZsYWdzKTsKK3ZvaWQg ZGVzdHJveVJldXNhYmxlRmlsZUhhbmRsZShzcWxpdGUzX2ZpbGUqIGZpbGUpOwogfQogCiAvLyBD aHJvbWl1bSdzIFBvc2l4IGltcGxlbWVudGF0aW9uIG9mIFNRTGl0ZSBWRlMKQEAgLTYwLDE3ICs2 MywyNyBAQCBpbnQgY2hyb21pdW1PcGVuKHNxbGl0ZTNfdmZzKiB2ZnMsIGNvbnN0CiAgICAgICAg ICAgICAgICAgIHNxbGl0ZTNfZmlsZSogaWQsIGludCBkZXNpcmVkRmxhZ3MsIGludCogdXNlZEZs YWdzKQogewogICAgIGluaXRVbml4RmlsZShpZCk7CisgICAgaW50IGZkID0gLTE7CiAgICAgaW50 IGRpcmZkID0gLTE7Ci0gICAgaW50IGZkID0gQ2hyb21pdW1CcmlkZ2U6OmRhdGFiYXNlT3BlbkZp bGUoZmlsZU5hbWUsIGRlc2lyZWRGbGFncywgJmRpcmZkKTsKKyAgICBpbnQgcmVzdWx0ID0gZ2V0 UmV1c2FibGVGaWxlSGFuZGxlKGlkLCBmaWxlTmFtZSwgZGVzaXJlZEZsYWdzLCAmZmQpOworICAg IGlmIChyZXN1bHQgIT0gU1FMSVRFX09LKQorICAgICAgICByZXR1cm4gcmVzdWx0OworCiAgICAg aWYgKGZkIDwgMCkgewotICAgICAgICBpZiAoZGVzaXJlZEZsYWdzICYgU1FMSVRFX09QRU5fUkVB RFdSSVRFKSB7CisgICAgICAgIGZkID0gQ2hyb21pdW1CcmlkZ2U6OmRhdGFiYXNlT3BlbkZpbGUo ZmlsZU5hbWUsIGRlc2lyZWRGbGFncywgJmRpcmZkKTsKKyAgICAgICAgaWYgKChmZCA8IDApICYm IChkZXNpcmVkRmxhZ3MgJiBTUUxJVEVfT1BFTl9SRUFEV1JJVEUpKSB7CiAgICAgICAgICAgICBp bnQgbmV3RmxhZ3MgPSAoZGVzaXJlZEZsYWdzICYgfihTUUxJVEVfT1BFTl9SRUFEV1JJVEUgfCBT UUxJVEVfT1BFTl9DUkVBVEUpKSB8IFNRTElURV9PUEVOX1JFQURPTkxZOwotICAgICAgICAgICAg cmV0dXJuIGNocm9taXVtT3Blbih2ZnMsIGZpbGVOYW1lLCBpZCwgbmV3RmxhZ3MsIHVzZWRGbGFn cyk7Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAgcmV0dXJuIFNRTElURV9DQU5UT1BFTjsK KyAgICAgICAgICAgIGZkID0gQ2hyb21pdW1CcmlkZ2U6OmRhdGFiYXNlT3BlbkZpbGUoZmlsZU5h bWUsIG5ld0ZsYWdzLCAmZGlyZmQpOworICAgICAgICB9CisgICAgfQorICAgIGlmIChmZCA8IDAp IHsKKyAgICAgICAgZGVzdHJveVJldXNhYmxlRmlsZUhhbmRsZShpZCk7CisgICAgICAgIHJldHVy biBTUUxJVEVfQ0FOVE9QRU47CiAgICAgfQorCiAgICAgaWYgKHVzZWRGbGFncykKICAgICAgICAg KnVzZWRGbGFncyA9IGRlc2lyZWRGbGFnczsKKyAgICB1cGRhdGVSZXVzYWJsZUZpbGVIYW5kbGUo aWQsIGZkLCBkZXNpcmVkRmxhZ3MpOwogCiAgICAgZmNudGwoZmQsIEZfU0VURkQsIGZjbnRsKGZk LCBGX0dFVEZEKSB8IEZEX0NMT0VYRUMpOwogICAgIGlmIChkaXJmZCA+PSAwKQpAQCAtNzksNyAr OTIsMTAgQEAgaW50IGNocm9taXVtT3BlbihzcWxpdGUzX3ZmcyogdmZzLCBjb25zdAogICAgIC8v IFRoZSBtYXNrIDB4MDAwMDdGMDAgZ2l2ZXMgdXMgdGhlIDcgYml0cyB0aGF0IGRldGVybWluZSB0 aGUgdHlwZSBvZiB0aGUgZmlsZSBTUUxpdGUgaXMgdHJ5aW5nIHRvIG9wZW4uCiAgICAgaW50IGZp bGVUeXBlID0gZGVzaXJlZEZsYWdzICYgMHgwMDAwN0YwMDsKICAgICBpbnQgbm9Mb2NrID0gKGZp bGVUeXBlICE9IFNRTElURV9PUEVOX01BSU5fREIpOwotICAgIHJldHVybiBmaWxsSW5Vbml4Rmls ZSh2ZnMsIGZkLCBkaXJmZCwgaWQsIGZpbGVOYW1lLCBub0xvY2spOworICAgIHJlc3VsdCA9IGZp bGxJblVuaXhGaWxlKHZmcywgZmQsIGRpcmZkLCBpZCwgZmlsZU5hbWUsIG5vTG9jayk7CisgICAg aWYgKHJlc3VsdCAhPSBTUUxJVEVfT0spCisgICAgICAgIGRlc3Ryb3lSZXVzYWJsZUZpbGVIYW5k bGUoaWQpOworICAgIHJldHVybiByZXN1bHQ7CiB9CiAKIC8vIERlbGV0ZXMgdGhlIGdpdmVuIGZp bGUuCg== 42995 2009-11-11 13:29:05 -0800 2009-11-11 15:25:49 -0800 patch patch text/plain 3280 dumi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDY5NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDktMTEtMDkgIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBGaXhpbmcgQ2hyb21pdW0ncyBQT1NJWCBWRlMgaW1wbGVtZW50YXRpb24sIGJ5IGFkZGluZyB0 aGUgcmVxdWlyZWQKKyAgICAgICAgInVzZWQgZmlsZSBkZXNjcmlwdG9ycyIgbG9naWMuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxMjc1CisKKyAg ICAgICAgKiBwbGF0Zm9ybS9zcWwvY2hyb21pdW0vU1FMaXRlRmlsZVN5c3RlbUNocm9taXVtUG9z aXguY3BwOgorCiAyMDA5LTExLTA5ICBOb3JiZXJ0IExlc2VyICA8bm9yYmVydC5sZXNlckBub2tp YS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4u CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL3NxbC9jaHJvbWl1bS9TUUxpdGVGaWxlU3lzdGVtQ2hy b21pdW1Qb3NpeC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9zcWwvY2hyb21p dW0vU1FMaXRlRmlsZVN5c3RlbUNocm9taXVtUG9zaXguY3BwCShyZXZpc2lvbiA1MDY5NikKKysr IFdlYkNvcmUvcGxhdGZvcm0vc3FsL2Nocm9taXVtL1NRTGl0ZUZpbGVTeXN0ZW1DaHJvbWl1bVBv c2l4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQsNiArNDQsOSBAQCB1c2luZyBuYW1lc3BhY2Ug V2ViQ29yZTsKIGV4dGVybiAiQyIgewogdm9pZCBpbml0VW5peEZpbGUoc3FsaXRlM19maWxlKiBm aWxlKTsKIGludCBmaWxsSW5Vbml4RmlsZShzcWxpdGUzX3ZmcyogdmZzLCBpbnQgZmQsIGludCBk aXJmZCwgc3FsaXRlM19maWxlKiBmaWxlLCBjb25zdCBjaGFyKiBmaWxlTmFtZSwgaW50IG5vTG9j ayk7CitpbnQgc3FsaXRlM3VuaXhfZ2V0UmV1c2FibGVGaWxlSGFuZGxlKHNxbGl0ZTNfZmlsZSog ZmlsZSwgY29uc3QgY2hhciogZmlsZU5hbWUsIGludCBmbGFncywgaW50KiBmZCk7Cit2b2lkIHNx bGl0ZTN1bml4X3VwZGF0ZVJldXNhYmxlRmlsZUhhbmRsZShzcWxpdGUzX2ZpbGUqIGZpbGUsIGlu dCBmZCwgaW50IGZsYWdzKTsKK3ZvaWQgc3FsaXRlM3VuaXhfZGVzdHJveVJldXNhYmxlRmlsZUhh bmRsZShzcWxpdGUzX2ZpbGUqIGZpbGUpOwogfQogCiAvLyBDaHJvbWl1bSdzIFBvc2l4IGltcGxl bWVudGF0aW9uIG9mIFNRTGl0ZSBWRlMKQEAgLTYwLDE3ICs2MywyNyBAQCBpbnQgY2hyb21pdW1P cGVuKHNxbGl0ZTNfdmZzKiB2ZnMsIGNvbnN0CiAgICAgICAgICAgICAgICAgIHNxbGl0ZTNfZmls ZSogaWQsIGludCBkZXNpcmVkRmxhZ3MsIGludCogdXNlZEZsYWdzKQogewogICAgIGluaXRVbml4 RmlsZShpZCk7CisgICAgaW50IGZkID0gLTE7CiAgICAgaW50IGRpcmZkID0gLTE7Ci0gICAgaW50 IGZkID0gQ2hyb21pdW1CcmlkZ2U6OmRhdGFiYXNlT3BlbkZpbGUoZmlsZU5hbWUsIGRlc2lyZWRG bGFncywgJmRpcmZkKTsKKyAgICBpbnQgcmVzdWx0ID0gc3FsaXRlM3VuaXhfZ2V0UmV1c2FibGVG aWxlSGFuZGxlKGlkLCBmaWxlTmFtZSwgZGVzaXJlZEZsYWdzLCAmZmQpOworICAgIGlmIChyZXN1 bHQgIT0gU1FMSVRFX09LKQorICAgICAgICByZXR1cm4gcmVzdWx0OworCiAgICAgaWYgKGZkIDwg MCkgewotICAgICAgICBpZiAoZGVzaXJlZEZsYWdzICYgU1FMSVRFX09QRU5fUkVBRFdSSVRFKSB7 CisgICAgICAgIGZkID0gQ2hyb21pdW1CcmlkZ2U6OmRhdGFiYXNlT3BlbkZpbGUoZmlsZU5hbWUs IGRlc2lyZWRGbGFncywgJmRpcmZkKTsKKyAgICAgICAgaWYgKChmZCA8IDApICYmIChkZXNpcmVk RmxhZ3MgJiBTUUxJVEVfT1BFTl9SRUFEV1JJVEUpKSB7CiAgICAgICAgICAgICBpbnQgbmV3Rmxh Z3MgPSAoZGVzaXJlZEZsYWdzICYgfihTUUxJVEVfT1BFTl9SRUFEV1JJVEUgfCBTUUxJVEVfT1BF Tl9DUkVBVEUpKSB8IFNRTElURV9PUEVOX1JFQURPTkxZOwotICAgICAgICAgICAgcmV0dXJuIGNo cm9taXVtT3Blbih2ZnMsIGZpbGVOYW1lLCBpZCwgbmV3RmxhZ3MsIHVzZWRGbGFncyk7Ci0gICAg ICAgIH0gZWxzZQotICAgICAgICAgICAgcmV0dXJuIFNRTElURV9DQU5UT1BFTjsKKyAgICAgICAg ICAgIGZkID0gQ2hyb21pdW1CcmlkZ2U6OmRhdGFiYXNlT3BlbkZpbGUoZmlsZU5hbWUsIG5ld0Zs YWdzLCAmZGlyZmQpOworICAgICAgICB9CisgICAgfQorICAgIGlmIChmZCA8IDApIHsKKyAgICAg ICAgc3FsaXRlM3VuaXhfZGVzdHJveVJldXNhYmxlRmlsZUhhbmRsZShpZCk7CisgICAgICAgIHJl dHVybiBTUUxJVEVfQ0FOVE9QRU47CiAgICAgfQorCiAgICAgaWYgKHVzZWRGbGFncykKICAgICAg ICAgKnVzZWRGbGFncyA9IGRlc2lyZWRGbGFnczsKKyAgICBzcWxpdGUzdW5peF91cGRhdGVSZXVz YWJsZUZpbGVIYW5kbGUoaWQsIGZkLCBkZXNpcmVkRmxhZ3MpOwogCiAgICAgZmNudGwoZmQsIEZf U0VURkQsIGZjbnRsKGZkLCBGX0dFVEZEKSB8IEZEX0NMT0VYRUMpOwogICAgIGlmIChkaXJmZCA+ PSAwKQpAQCAtNzksNyArOTIsMTAgQEAgaW50IGNocm9taXVtT3BlbihzcWxpdGUzX3ZmcyogdmZz LCBjb25zdAogICAgIC8vIFRoZSBtYXNrIDB4MDAwMDdGMDAgZ2l2ZXMgdXMgdGhlIDcgYml0cyB0 aGF0IGRldGVybWluZSB0aGUgdHlwZSBvZiB0aGUgZmlsZSBTUUxpdGUgaXMgdHJ5aW5nIHRvIG9w ZW4uCiAgICAgaW50IGZpbGVUeXBlID0gZGVzaXJlZEZsYWdzICYgMHgwMDAwN0YwMDsKICAgICBp bnQgbm9Mb2NrID0gKGZpbGVUeXBlICE9IFNRTElURV9PUEVOX01BSU5fREIpOwotICAgIHJldHVy biBmaWxsSW5Vbml4RmlsZSh2ZnMsIGZkLCBkaXJmZCwgaWQsIGZpbGVOYW1lLCBub0xvY2spOwor ICAgIHJlc3VsdCA9IGZpbGxJblVuaXhGaWxlKHZmcywgZmQsIGRpcmZkLCBpZCwgZmlsZU5hbWUs IG5vTG9jayk7CisgICAgaWYgKHJlc3VsdCAhPSBTUUxJVEVfT0spCisgICAgICAgIHNxbGl0ZTN1 bml4X2Rlc3Ryb3lSZXVzYWJsZUZpbGVIYW5kbGUoaWQpOworICAgIHJldHVybiByZXN1bHQ7CiB9 CiAKIC8vIERlbGV0ZXMgdGhlIGdpdmVuIGZpbGUuCg== 43011 2009-11-11 15:25:49 -0800 2009-11-11 21:48:18 -0800 patch patch text/plain 3708 dumi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDY5NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDktMTEtMDkgIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBGaXhpbmcgQ2hyb21pdW0ncyBQT1NJWCBWRlMgaW1wbGVtZW50YXRpb24sIGJ5IGFkZGluZyB0 aGUgcmVxdWlyZWQKKyAgICAgICAgInVzZWQgZmlsZSBkZXNjcmlwdG9ycyIgbG9naWMuCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMxMjc1CisKKyAg ICAgICAgKiBwbGF0Zm9ybS9zcWwvY2hyb21pdW0vU1FMaXRlRmlsZVN5c3RlbUNocm9taXVtUG9z aXguY3BwOgorCiAyMDA5LTExLTA5ICBOb3JiZXJ0IExlc2VyICA8bm9yYmVydC5sZXNlckBub2tp YS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4u CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL3NxbC9jaHJvbWl1bS9TUUxpdGVGaWxlU3lzdGVtQ2hy b21pdW1Qb3NpeC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9zcWwvY2hyb21p dW0vU1FMaXRlRmlsZVN5c3RlbUNocm9taXVtUG9zaXguY3BwCShyZXZpc2lvbiA1MDY5NikKKysr IFdlYkNvcmUvcGxhdGZvcm0vc3FsL2Nocm9taXVtL1NRTGl0ZUZpbGVTeXN0ZW1DaHJvbWl1bVBv c2l4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDIsOCArNDIsMTEgQEAgdXNpbmcgbmFtZXNwYWNl IFdlYkNvcmU7CiAKIC8vIERlZmluZWQgaW4gQ2hyb21pdW0ncyBjb2RlYmFzZSBpbiB0aGlyZF9w YXJ0eS9zcWxpdGUvc3JjL29zX3VuaXguYwogZXh0ZXJuICJDIiB7Ci12b2lkIGluaXRVbml4Rmls ZShzcWxpdGUzX2ZpbGUqIGZpbGUpOwotaW50IGZpbGxJblVuaXhGaWxlKHNxbGl0ZTNfdmZzKiB2 ZnMsIGludCBmZCwgaW50IGRpcmZkLCBzcWxpdGUzX2ZpbGUqIGZpbGUsIGNvbnN0IGNoYXIqIGZp bGVOYW1lLCBpbnQgbm9Mb2NrKTsKK3ZvaWQgY2hyb21pdW1fc3FsaXRlM19pbml0aWFsaXplX3Vu aXhfc3FsaXRlM19maWxlKHNxbGl0ZTNfZmlsZSogZmlsZSk7CitpbnQgY2hyb21pdW1fc3FsaXRl M19maWxsX2luX3VuaXhfc3FsaXRlM19maWxlKHNxbGl0ZTNfdmZzKiB2ZnMsIGludCBmZCwgaW50 IGRpcmZkLCBzcWxpdGUzX2ZpbGUqIGZpbGUsIGNvbnN0IGNoYXIqIGZpbGVOYW1lLCBpbnQgbm9M b2NrKTsKK2ludCBjaHJvbWl1bV9zcWxpdGUzX2dldF9yZXVzYWJsZV9maWxlX2hhbmRsZShzcWxp dGUzX2ZpbGUqIGZpbGUsIGNvbnN0IGNoYXIqIGZpbGVOYW1lLCBpbnQgZmxhZ3MsIGludCogZmQp Owordm9pZCBjaHJvbWl1bV9zcWxpdGUzX3VwZGF0ZV9yZXVzYWJsZV9maWxlX2hhbmRsZShzcWxp dGUzX2ZpbGUqIGZpbGUsIGludCBmZCwgaW50IGZsYWdzKTsKK3ZvaWQgY2hyb21pdW1fc3FsaXRl M19kZXN0cm95X3JldXNhYmxlX2ZpbGVfaGFuZGxlKHNxbGl0ZTNfZmlsZSogZmlsZSk7CiB9CiAK IC8vIENocm9taXVtJ3MgUG9zaXggaW1wbGVtZW50YXRpb24gb2YgU1FMaXRlIFZGUwpAQCAtNTks MTggKzYyLDI4IEBAIG5hbWVzcGFjZSB7CiBpbnQgY2hyb21pdW1PcGVuKHNxbGl0ZTNfdmZzKiB2 ZnMsIGNvbnN0IGNoYXIqIGZpbGVOYW1lLAogICAgICAgICAgICAgICAgICBzcWxpdGUzX2ZpbGUq IGlkLCBpbnQgZGVzaXJlZEZsYWdzLCBpbnQqIHVzZWRGbGFncykKIHsKLSAgICBpbml0VW5peEZp bGUoaWQpOworICAgIGNocm9taXVtX3NxbGl0ZTNfaW5pdGlhbGl6ZV91bml4X3NxbGl0ZTNfZmls ZShpZCk7CisgICAgaW50IGZkID0gLTE7CiAgICAgaW50IGRpcmZkID0gLTE7Ci0gICAgaW50IGZk ID0gQ2hyb21pdW1CcmlkZ2U6OmRhdGFiYXNlT3BlbkZpbGUoZmlsZU5hbWUsIGRlc2lyZWRGbGFn cywgJmRpcmZkKTsKKyAgICBpbnQgcmVzdWx0ID0gY2hyb21pdW1fc3FsaXRlM19nZXRfcmV1c2Fi bGVfZmlsZV9oYW5kbGUoaWQsIGZpbGVOYW1lLCBkZXNpcmVkRmxhZ3MsICZmZCk7CisgICAgaWYg KHJlc3VsdCAhPSBTUUxJVEVfT0spCisgICAgICAgIHJldHVybiByZXN1bHQ7CisKICAgICBpZiAo ZmQgPCAwKSB7Ci0gICAgICAgIGlmIChkZXNpcmVkRmxhZ3MgJiBTUUxJVEVfT1BFTl9SRUFEV1JJ VEUpIHsKKyAgICAgICAgZmQgPSBDaHJvbWl1bUJyaWRnZTo6ZGF0YWJhc2VPcGVuRmlsZShmaWxl TmFtZSwgZGVzaXJlZEZsYWdzLCAmZGlyZmQpOworICAgICAgICBpZiAoKGZkIDwgMCkgJiYgKGRl c2lyZWRGbGFncyAmIFNRTElURV9PUEVOX1JFQURXUklURSkpIHsKICAgICAgICAgICAgIGludCBu ZXdGbGFncyA9IChkZXNpcmVkRmxhZ3MgJiB+KFNRTElURV9PUEVOX1JFQURXUklURSB8IFNRTElU RV9PUEVOX0NSRUFURSkpIHwgU1FMSVRFX09QRU5fUkVBRE9OTFk7Ci0gICAgICAgICAgICByZXR1 cm4gY2hyb21pdW1PcGVuKHZmcywgZmlsZU5hbWUsIGlkLCBuZXdGbGFncywgdXNlZEZsYWdzKTsK LSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICByZXR1cm4gU1FMSVRFX0NBTlRPUEVOOworICAg ICAgICAgICAgZmQgPSBDaHJvbWl1bUJyaWRnZTo6ZGF0YWJhc2VPcGVuRmlsZShmaWxlTmFtZSwg bmV3RmxhZ3MsICZkaXJmZCk7CisgICAgICAgIH0KKyAgICB9CisgICAgaWYgKGZkIDwgMCkgewor ICAgICAgICBjaHJvbWl1bV9zcWxpdGUzX2Rlc3Ryb3lfcmV1c2FibGVfZmlsZV9oYW5kbGUoaWQp OworICAgICAgICByZXR1cm4gU1FMSVRFX0NBTlRPUEVOOwogICAgIH0KKwogICAgIGlmICh1c2Vk RmxhZ3MpCiAgICAgICAgICp1c2VkRmxhZ3MgPSBkZXNpcmVkRmxhZ3M7CisgICAgY2hyb21pdW1f c3FsaXRlM191cGRhdGVfcmV1c2FibGVfZmlsZV9oYW5kbGUoaWQsIGZkLCBkZXNpcmVkRmxhZ3Mp OwogCiAgICAgZmNudGwoZmQsIEZfU0VURkQsIGZjbnRsKGZkLCBGX0dFVEZEKSB8IEZEX0NMT0VY RUMpOwogICAgIGlmIChkaXJmZCA+PSAwKQpAQCAtNzksNyArOTIsMTAgQEAgaW50IGNocm9taXVt T3BlbihzcWxpdGUzX3ZmcyogdmZzLCBjb25zdAogICAgIC8vIFRoZSBtYXNrIDB4MDAwMDdGMDAg Z2l2ZXMgdXMgdGhlIDcgYml0cyB0aGF0IGRldGVybWluZSB0aGUgdHlwZSBvZiB0aGUgZmlsZSBT UUxpdGUgaXMgdHJ5aW5nIHRvIG9wZW4uCiAgICAgaW50IGZpbGVUeXBlID0gZGVzaXJlZEZsYWdz ICYgMHgwMDAwN0YwMDsKICAgICBpbnQgbm9Mb2NrID0gKGZpbGVUeXBlICE9IFNRTElURV9PUEVO X01BSU5fREIpOwotICAgIHJldHVybiBmaWxsSW5Vbml4RmlsZSh2ZnMsIGZkLCBkaXJmZCwgaWQs IGZpbGVOYW1lLCBub0xvY2spOworICAgIHJlc3VsdCA9IGZpbGxJblVuaXhGaWxlKHZmcywgZmQs IGRpcmZkLCBpZCwgZmlsZU5hbWUsIG5vTG9jayk7CisgICAgaWYgKHJlc3VsdCAhPSBTUUxJVEVf T0spCisgICAgICAgIGNocm9taXVtX3NxbGl0ZTNfZGVzdHJveV9yZXVzYWJsZV9maWxlX2hhbmRs ZShpZCk7CisgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAogLy8gRGVsZXRlcyB0aGUgZ2l2ZW4gZmls ZS4K