62935 2011-06-18 12:15:23 -0700 [GTK] Fix GTK unit tests failures when WebKit is build outside repository directory. 2011-07-14 14:27:15 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) All Linux RESOLVED FIXED P2 Normal --- 34940 0 l.slachciak webkit-unassigned a.renevier gustavo oldest_to_newest 423160 0 l.slachciak 2011-06-18 12:15:23 -0700 WebKit can be build with WEBKITOUTPUTDIR env variable set using build-webkit script. In this case WEBKITOUTPUDIR may be outside repository structure. This causes testmimehandling and testwebview to fail because they use external test files in WebKit Source directory. This bug fixes this issue introducing optional environment variable WEBKITREPODIR 423165 1 97704 l.slachciak 2011-06-18 12:20:40 -0700 Created attachment 97704 testutils1.patch 423341 2 l.slachciak 2011-06-19 00:17:46 -0700 Subscribing Arno and Gustavo involved in connected bug (this one improves it) - 34940 [Gtk] testwebview does not work when called with absolute path 425093 3 98135 l.slachciak 2011-06-22 01:59:06 -0700 Created attachment 98135 Patch 425111 4 98142 l.slachciak 2011-06-22 02:54:20 -0700 Created attachment 98142 Patch2 Updated code style 434875 5 98142 gustavo 2011-07-11 07:55:40 -0700 Comment on attachment 98142 Patch2 View in context: https://bugs.webkit.org/attachment.cgi?id=98142&action=review > Source/WebKit/gtk/tests/test_utils.c:34 > + /* user can set location of the webkit repository directory if it differs from build directory */ > + const char* repo_path = g_getenv("WEBKITREPODIR"); > + if (repo_path) { > + if (g_chdir(repo_path)) { > + return -1; > + } > + } > + else if (g_path_is_absolute(executable_path)) { Indentation seems quite off here, or is it the patch viewer? The inner if should not have bracers (this file has plenty of this problem, unfortunately), and the else if should be in the same line as the }. Also, given this is a C file, the * should be on the right side. What do you think of doing a style cleanup on this file? ;) 436637 6 98142 l.slachciak 2011-07-13 13:56:38 -0700 Comment on attachment 98142 Patch2 View in context: https://bugs.webkit.org/attachment.cgi?id=98142&action=review >> Source/WebKit/gtk/tests/test_utils.c:34 >> + else if (g_path_is_absolute(executable_path)) { > > Indentation seems quite off here, or is it the patch viewer? The inner if should not have bracers (this file has plenty of this problem, unfortunately), and the else if should be in the same line as the }. Also, given this is a C file, the * should be on the right side. What do you think of doing a style cleanup on this file? ;) Indentation fixed. Coding style cleanup done. Unfortunately this file has exception in check-webkit-style so it is not taken into account when checking style 436641 7 100705 l.slachciak 2011-07-13 14:02:05 -0700 Created attachment 100705 Fix GTK unit test failures + coding style enhancements 437048 8 100705 gustavo 2011-07-14 06:28:42 -0700 Comment on attachment 100705 Fix GTK unit test failures View in context: https://bugs.webkit.org/attachment.cgi?id=100705&action=review > Source/WebKit/gtk/tests/test_utils.c:31 > + if (repoPath) { > + if (g_chdir(repoPath)) > + return -1; I believe this return is still misindented; there is a tab here. I'll land it manually and fix it before doing it. 437051 9 100705 gustavo 2011-07-14 06:31:45 -0700 Comment on attachment 100705 Fix GTK unit test failures http://trac.webkit.org/changeset/90994 437334 10 l.slachciak 2011-07-14 14:27:15 -0700 Gustavo, thank you for review and commit update. 97704 2011-06-18 12:20:40 -0700 2011-06-22 01:59:06 -0700 testutils1.patch testutils1.patch text/plain 1775 l.slachciak ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZwppbmRleCBmZTUyZGE3Li5hZTg1Y2RkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTggQEAKKzIwMTEtMDYtMTggIEx1a2FzeiBTbGFjaGNpYWsgIDxsLnNsYWNoY2lh a0BzYW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbR1RLXSBGaXggR1RLIHVuaXQgdGVzdHMgZmFpbHVyZXMgd2hlbiBXZWJLaXQgaXMg YnVpbGQgb3V0c2lkZSByZXBvc2l0b3J5IGRpcmVjdG9yeS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyOTM1CisKKyAgICAgICAgV2ViS2l0IGNhbiBi ZSBidWlsZCB3aXRoIFdFQktJVE9VVFBVVERJUiBlbnYgdmFyaWFibGUgc2V0IHVzaW5nIGJ1aWxk LXdlYmtpdCBzY3JpcHQuCisgICAgICAgIEluIHRoaXMgY2FzZSBXRUJLSVRPVVRQVURJUiBtYXkg YmUgb3V0c2lkZSByZXBvc2l0b3J5IHN0cnVjdHVyZS4gVGhpcyBjYXVzZXMgdGVzdG1pbWVoYW5k bGluZyBhbmQgdGVzdHdlYnZpZXcKKyAgICAgICAgdG8gZmFpbCBiZWNhdXNlIHRoZXkgdXNlIGV4 dGVybmFsIHRlc3QgZmlsZXMgaW4gV2ViS2l0IFNvdXJjZSBkaXJlY3RvcnkuCisgICAgICAgIFRo aXMgYnVnIGZpeGVzIHRoaXMgaXNzdWUgaW50cm9kdWNpbmcgb3B0aW9uYWwgZW52aXJvbm1lbnQg dmFyaWFibGUgV0VCS0lUUkVQT0RJUgorCisgICAgICAgICogdGVzdHMvdGVzdF91dGlscy5jOgor ICAgICAgICAodGVzdHV0aWxzX3JlbGF0aXZlX2NoZGlyKTogSWYgV0VCS0lUUkVQT0RJUiBpcyBz ZXQsIGNoYW5nZSBjdXJyZW50IGRpcmVjdG9yeSB0byBpdC4KKwogMjAxMS0wNi0xNyAgSm9vbmUg SHVyICA8am9vbmUuaHVyQGNvbGxhYm9yYS5jby51az4KIAogICAgICAgICBSZXZpZXdlZCBieSBN YXJ0aW4gUm9iaW5zb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0 X3V0aWxzLmMgYi9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0X3V0aWxzLmMKaW5kZXggNjQ2 ZmQyNS4uMTVlYmM1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdF91 dGlscy5jCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3RfdXRpbHMuYwpAQCAtMjQs NyArMjQsMTIgQEAKIAogaW50IHRlc3R1dGlsc19yZWxhdGl2ZV9jaGRpcihjb25zdCBnY2hhciog dGFyZ2V0X2ZpbGVuYW1lLCBjb25zdCBnY2hhciogZXhlY3V0YWJsZV9wYXRoKQogewotICAgIGlm IChnX3BhdGhfaXNfYWJzb2x1dGUoZXhlY3V0YWJsZV9wYXRoKSkgeworICAgIC8qIHVzZXIgY2Fu IHNldCBsb2NhdGlvbiBvZiB0aGUgd2Via2l0IHJlcG9zaXRvcnkgZGlyZWN0b3J5IGlmIGl0IGRp ZmZlcnMgZnJvbSBidWlsZCBkaXJlY3RvcnkgKi8KKyAgICBjb25zdCBjaGFyKiByZXBvX3BhdGgg PSBnX2dldGVudigiV0VCS0lUUkVQT0RJUiIpOworICAgIGlmIChyZXBvX3BhdGgpIHsKKyAgICAg ICAgZ19jaGRpcihyZXBvX3BhdGgpOworICAgIH0KKyAgICBlbHNlIGlmIChnX3BhdGhfaXNfYWJz b2x1dGUoZXhlY3V0YWJsZV9wYXRoKSkgewogICAgICAgICBpZiAoZ19jaGRpcihnX3BhdGhfZ2V0 X2Rpcm5hbWUoZXhlY3V0YWJsZV9wYXRoKSkpIHsKICAgICAgICAgICAgIHJldHVybiAtMTsKICAg ICAgICAgfQo= 98135 2011-06-22 01:59:06 -0700 2011-06-22 02:54:20 -0700 Patch testutils1.patch text/plain 1775 l.slachciak ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZwppbmRleCBmZTUyZGE3Li5hZTg1Y2RkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTggQEAKKzIwMTEtMDYtMTggIEx1a2FzeiBTbGFjaGNpYWsgIDxsLnNsYWNoY2lh a0BzYW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbR1RLXSBGaXggR1RLIHVuaXQgdGVzdHMgZmFpbHVyZXMgd2hlbiBXZWJLaXQgaXMg YnVpbGQgb3V0c2lkZSByZXBvc2l0b3J5IGRpcmVjdG9yeS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyOTM1CisKKyAgICAgICAgV2ViS2l0IGNhbiBi ZSBidWlsZCB3aXRoIFdFQktJVE9VVFBVVERJUiBlbnYgdmFyaWFibGUgc2V0IHVzaW5nIGJ1aWxk LXdlYmtpdCBzY3JpcHQuCisgICAgICAgIEluIHRoaXMgY2FzZSBXRUJLSVRPVVRQVURJUiBtYXkg YmUgb3V0c2lkZSByZXBvc2l0b3J5IHN0cnVjdHVyZS4gVGhpcyBjYXVzZXMgdGVzdG1pbWVoYW5k bGluZyBhbmQgdGVzdHdlYnZpZXcKKyAgICAgICAgdG8gZmFpbCBiZWNhdXNlIHRoZXkgdXNlIGV4 dGVybmFsIHRlc3QgZmlsZXMgaW4gV2ViS2l0IFNvdXJjZSBkaXJlY3RvcnkuCisgICAgICAgIFRo aXMgYnVnIGZpeGVzIHRoaXMgaXNzdWUgaW50cm9kdWNpbmcgb3B0aW9uYWwgZW52aXJvbm1lbnQg dmFyaWFibGUgV0VCS0lUUkVQT0RJUgorCisgICAgICAgICogdGVzdHMvdGVzdF91dGlscy5jOgor ICAgICAgICAodGVzdHV0aWxzX3JlbGF0aXZlX2NoZGlyKTogSWYgV0VCS0lUUkVQT0RJUiBpcyBz ZXQsIGNoYW5nZSBjdXJyZW50IGRpcmVjdG9yeSB0byBpdC4KKwogMjAxMS0wNi0xNyAgSm9vbmUg SHVyICA8am9vbmUuaHVyQGNvbGxhYm9yYS5jby51az4KIAogICAgICAgICBSZXZpZXdlZCBieSBN YXJ0aW4gUm9iaW5zb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0 X3V0aWxzLmMgYi9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0X3V0aWxzLmMKaW5kZXggNjQ2 ZmQyNS4uMTVlYmM1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdF91 dGlscy5jCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3RfdXRpbHMuYwpAQCAtMjQs NyArMjQsMTIgQEAKIAogaW50IHRlc3R1dGlsc19yZWxhdGl2ZV9jaGRpcihjb25zdCBnY2hhciog dGFyZ2V0X2ZpbGVuYW1lLCBjb25zdCBnY2hhciogZXhlY3V0YWJsZV9wYXRoKQogewotICAgIGlm IChnX3BhdGhfaXNfYWJzb2x1dGUoZXhlY3V0YWJsZV9wYXRoKSkgeworICAgIC8qIHVzZXIgY2Fu IHNldCBsb2NhdGlvbiBvZiB0aGUgd2Via2l0IHJlcG9zaXRvcnkgZGlyZWN0b3J5IGlmIGl0IGRp ZmZlcnMgZnJvbSBidWlsZCBkaXJlY3RvcnkgKi8KKyAgICBjb25zdCBjaGFyKiByZXBvX3BhdGgg PSBnX2dldGVudigiV0VCS0lUUkVQT0RJUiIpOworICAgIGlmIChyZXBvX3BhdGgpIHsKKyAgICAg ICAgZ19jaGRpcihyZXBvX3BhdGgpOworICAgIH0KKyAgICBlbHNlIGlmIChnX3BhdGhfaXNfYWJz b2x1dGUoZXhlY3V0YWJsZV9wYXRoKSkgewogICAgICAgICBpZiAoZ19jaGRpcihnX3BhdGhfZ2V0 X2Rpcm5hbWUoZXhlY3V0YWJsZV9wYXRoKSkpIHsKICAgICAgICAgICAgIHJldHVybiAtMTsKICAg ICAgICAgfQo= 98142 2011-06-22 02:54:20 -0700 2011-07-13 14:02:05 -0700 Patch2 testutils2.patch text/plain 1797 l.slachciak ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZwppbmRleCA4MDU2NjMyLi44ZThjNDBjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTggQEAKKzIwMTEtMDYtMTggIEx1a2FzeiBTbGFjaGNpYWsgIDxsLnNsYWNoY2lh a0BzYW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbR1RLXSBGaXggR1RLIHVuaXQgdGVzdHMgZmFpbHVyZXMgd2hlbiBXZWJLaXQgaXMg YnVpbGQgb3V0c2lkZSByZXBvc2l0b3J5IGRpcmVjdG9yeS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyOTM1CisKKyAgICAgICAgV2ViS2l0IGNhbiBi ZSBidWlsZCB3aXRoIFdFQktJVE9VVFBVVERJUiBlbnYgdmFyaWFibGUgc2V0IHVzaW5nIGJ1aWxk LXdlYmtpdCBzY3JpcHQuCisgICAgICAgIEluIHRoaXMgY2FzZSBXRUJLSVRPVVRQVURJUiBtYXkg YmUgb3V0c2lkZSByZXBvc2l0b3J5IHN0cnVjdHVyZS4gVGhpcyBjYXVzZXMgdGVzdG1pbWVoYW5k bGluZyBhbmQgdGVzdHdlYnZpZXcKKyAgICAgICAgdG8gZmFpbCBiZWNhdXNlIHRoZXkgdXNlIGV4 dGVybmFsIHRlc3QgZmlsZXMgaW4gV2ViS2l0IFNvdXJjZSBkaXJlY3RvcnkuCisgICAgICAgIFRo aXMgYnVnIGZpeGVzIHRoaXMgaXNzdWUgaW50cm9kdWNpbmcgb3B0aW9uYWwgZW52aXJvbm1lbnQg dmFyaWFibGUgV0VCS0lUUkVQT0RJUgorCisgICAgICAgICogdGVzdHMvdGVzdF91dGlscy5jOgor ICAgICAgICAodGVzdHV0aWxzX3JlbGF0aXZlX2NoZGlyKTogSWYgV0VCS0lUUkVQT0RJUiBpcyBz ZXQsIGNoYW5nZSBjdXJyZW50IGRpcmVjdG9yeSB0byBpdC4KKwogMjAxMS0wNi0xMCAgTWFydGlu IFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg WGFuIExvcGV6LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdF91dGls cy5jIGIvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdF91dGlscy5jCmluZGV4IDY0NmZkMjUu LmU5MmQyZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3RfdXRpbHMu YworKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0X3V0aWxzLmMKQEAgLTI0LDcgKzI0 LDE0IEBACiAKIGludCB0ZXN0dXRpbHNfcmVsYXRpdmVfY2hkaXIoY29uc3QgZ2NoYXIqIHRhcmdl dF9maWxlbmFtZSwgY29uc3QgZ2NoYXIqIGV4ZWN1dGFibGVfcGF0aCkKIHsKLSAgICBpZiAoZ19w YXRoX2lzX2Fic29sdXRlKGV4ZWN1dGFibGVfcGF0aCkpIHsKKyAgICAvKiB1c2VyIGNhbiBzZXQg bG9jYXRpb24gb2YgdGhlIHdlYmtpdCByZXBvc2l0b3J5IGRpcmVjdG9yeSBpZiBpdCBkaWZmZXJz IGZyb20gYnVpbGQgZGlyZWN0b3J5ICovCisgICAgY29uc3QgY2hhciogcmVwb19wYXRoID0gZ19n ZXRlbnYoIldFQktJVFJFUE9ESVIiKTsKKyAgICBpZiAocmVwb19wYXRoKSB7CisgICAgICAgIGlm IChnX2NoZGlyKHJlcG9fcGF0aCkpIHsKKwkgICAgcmV0dXJuIC0xOworCX0KKyAgICB9CisgICAg ZWxzZSBpZiAoZ19wYXRoX2lzX2Fic29sdXRlKGV4ZWN1dGFibGVfcGF0aCkpIHsKICAgICAgICAg aWYgKGdfY2hkaXIoZ19wYXRoX2dldF9kaXJuYW1lKGV4ZWN1dGFibGVfcGF0aCkpKSB7CiAgICAg ICAgICAgICByZXR1cm4gLTE7CiAgICAgICAgIH0K 100705 2011-07-13 14:02:05 -0700 2011-07-14 06:31:45 -0700 Fix GTK unit test failures repodir.patch text/plain 3349 l.slachciak ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZwppbmRleCBkZjYyMjQ0Li4zNzdlMDBjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTEtMDctMTMgIEx1a2FzeiBTbGFjaGNpYWsgIDxsLnNsYWNoY2lh a0BzYW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBbR1RLXSBGaXggR1RLIHVuaXQgdGVzdHMgZmFpbHVyZXMgd2hlbiBXZWJLaXQgaXMg YnVpbGQgb3V0c2lkZSByZXBvc2l0b3J5IGRpcmVjdG9yeS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyOTM1CisKKyAgICAgICAgV2ViS2l0IGNhbiBi ZSBidWlsZCB3aXRoIFdFQktJVE9VVFBVVERJUiBlbnYgdmFyaWFibGUgc2V0IHVzaW5nIGJ1aWxk LXdlYmtpdCBzY3JpcHQuCisgICAgICAgIEluIHRoaXMgY2FzZSBXRUJLSVRPVVRQVURJUiBtYXkg YmUgb3V0c2lkZSByZXBvc2l0b3J5IHN0cnVjdHVyZS4gVGhpcyBjYXVzZXMgdGVzdG1pbWVoYW5k bGluZyBhbmQgdGVzdHdlYnZpZXcKKyAgICAgICAgdG8gZmFpbCBiZWNhdXNlIHRoZXkgdXNlIGV4 dGVybmFsIHRlc3QgZmlsZXMgaW4gV2ViS2l0IFNvdXJjZSBkaXJlY3RvcnkuCisgICAgICAgIFRo aXMgYnVnIGZpeGVzIHRoaXMgaXNzdWUgaW50cm9kdWNpbmcgb3B0aW9uYWwgZW52aXJvbm1lbnQg dmFyaWFibGUgV0VCS0lUUkVQT0RJUgorICAgICAgICBBbHNvIGNvZGluZyBzdHlsZSBpbiBleGlz dGluZyBmdW5jdGlvbnMgaXMgZml4ZWQuCisKKworICAgICAgICAqIHRlc3RzL3Rlc3RfdXRpbHMu YzogQ29kaW5nIHN0eWxlIGZpeGVzLgorICAgICAgICAodGVzdHV0aWxzX3JlbGF0aXZlX2NoZGly KTogSWYgV0VCS0lUUkVQT0RJUiBpcyBzZXQsIGNoYW5nZSBjdXJyZW50IGRpcmVjdG9yeSB0byBp dC4KKyAgICAgICAgKiB0ZXN0cy90ZXN0X3V0aWxzLmg6IENvZGluZyBzdHlsZSBmaXhlcy4KKwog MjAxMS0wNi0xNCAgTWlrZSBTdGVnZW1hbiAgPG1yc3RlZ2VtYW5AZ21haWwuY29tPgogCiAgICAg ICAgIEFkZCBBUEkgdG8gV2ViS2l0LUdUSyB0byBhbGxvdyBzZXR0aW5nIGxvY2FsU3RvcmFnZSBk YXRhYmFzZSBwYXRoCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0X3V0 aWxzLmMgYi9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0X3V0aWxzLmMKaW5kZXggNjQ2ZmQy NS4uMmYyNTQ5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdF91dGls cy5jCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3RfdXRpbHMuYwpAQCAtMjIsMjkg KzIyLDMyIEBACiAjaW5jbHVkZSA8Z2xpYi5oPgogI2luY2x1ZGUgPGdsaWIvZ3N0ZGlvLmg+CiAK LWludCB0ZXN0dXRpbHNfcmVsYXRpdmVfY2hkaXIoY29uc3QgZ2NoYXIqIHRhcmdldF9maWxlbmFt ZSwgY29uc3QgZ2NoYXIqIGV4ZWN1dGFibGVfcGF0aCkKK2ludCB0ZXN0dXRpbHNfcmVsYXRpdmVf Y2hkaXIoY29uc3QgZ2NoYXIgKnRhcmdldEZpbGVuYW1lLCBjb25zdCBnY2hhciAqZXhlY3V0YWJs ZVBhdGgpCiB7Ci0gICAgaWYgKGdfcGF0aF9pc19hYnNvbHV0ZShleGVjdXRhYmxlX3BhdGgpKSB7 Ci0gICAgICAgIGlmIChnX2NoZGlyKGdfcGF0aF9nZXRfZGlybmFtZShleGVjdXRhYmxlX3BhdGgp KSkgeworICAgIC8qIHVzZXIgY2FuIHNldCBsb2NhdGlvbiBvZiB0aGUgd2Via2l0IHJlcG9zaXRv cnkgZGlyZWN0b3J5IGlmIGl0IGRpZmZlcnMgZnJvbSBidWlsZCBkaXJlY3RvcnkgKi8KKyAgICBj b25zdCBnY2hhciAqcmVwb1BhdGggPSBnX2dldGVudigiV0VCS0lUUkVQT0RJUiIpOworICAgIGlm IChyZXBvUGF0aCkgeworICAgICAgICBpZiAoZ19jaGRpcihyZXBvUGF0aCkpCisJICAgIHJldHVy biAtMTsKKyAgICB9IGVsc2UgaWYgKGdfcGF0aF9pc19hYnNvbHV0ZShleGVjdXRhYmxlUGF0aCkp IHsKKyAgICAgICAgaWYgKGdfY2hkaXIoZ19wYXRoX2dldF9kaXJuYW1lKGV4ZWN1dGFibGVQYXRo KSkpCiAgICAgICAgICAgICByZXR1cm4gLTE7Ci0gICAgICAgIH0KICAgICB9CiAKLSAgICB3aGls ZSAoIWdfZmlsZV90ZXN0KHRhcmdldF9maWxlbmFtZSwgR19GSUxFX1RFU1RfRVhJU1RTKSkgewot ICAgICAgICBnY2hhciAqcGF0aF9uYW1lOwotICAgICAgICBpZiAoZ19jaGRpcigiLi4iKSkgewor ICAgIHdoaWxlICghZ19maWxlX3Rlc3QodGFyZ2V0RmlsZW5hbWUsIEdfRklMRV9URVNUX0VYSVNU UykpIHsKKyAgICAgICAgZ2NoYXIgKnBhdGhOYW1lOworICAgICAgICBpZiAoZ19jaGRpcigiLi4i KSkKICAgICAgICAgICAgIHJldHVybiAtMTsKLSAgICAgICAgfQotICAgICAgICBnX2Fzc2VydCgh Z19zdHJfZXF1YWwoKHBhdGhfbmFtZSA9IGdfZ2V0X2N1cnJlbnRfZGlyKCkpLCAiLyIpKTsKLSAg ICAgICAgZ19mcmVlKHBhdGhfbmFtZSk7CisgICAgICAgIGdfYXNzZXJ0KCFnX3N0cl9lcXVhbCgo cGF0aE5hbWUgPSBnX2dldF9jdXJyZW50X2RpcigpKSwgIi8iKSk7CisgICAgICAgIGdfZnJlZShw YXRoTmFtZSk7CiAgICAgfQogCi0gICAgZ2NoYXIqIGRpcm5hbWUgPSBnX3BhdGhfZ2V0X2Rpcm5h bWUodGFyZ2V0X2ZpbGVuYW1lKTsKLSAgICBpZiAoZ19jaGRpcihkaXJuYW1lKSkgewotICAgICAg ICBnX2ZyZWUoZGlybmFtZSk7CisgICAgZ2NoYXIgKmRpck5hbWUgPSBnX3BhdGhfZ2V0X2Rpcm5h bWUodGFyZ2V0RmlsZW5hbWUpOworICAgIGlmIChnX2NoZGlyKGRpck5hbWUpKSB7CisgICAgICAg IGdfZnJlZShkaXJOYW1lKTsKICAgICAgICAgcmV0dXJuIC0xOwogICAgIH0KIAotICAgIGdfZnJl ZShkaXJuYW1lKTsKKyAgICBnX2ZyZWUoZGlyTmFtZSk7CiAgICAgcmV0dXJuIDA7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0X3V0aWxzLmggYi9Tb3VyY2UvV2Vi S2l0L2d0ay90ZXN0cy90ZXN0X3V0aWxzLmgKaW5kZXggZTc2MWY3NC4uZWM2MGRhMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdF91dGlscy5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvZ3RrL3Rlc3RzL3Rlc3RfdXRpbHMuaApAQCAtMSwzICsxLDMgQEAKICNpbmNsdWRlIDxn bGliLmg+CiAKLWludCB0ZXN0dXRpbHNfcmVsYXRpdmVfY2hkaXIoY29uc3QgZ2NoYXIqLCBjb25z dCBnY2hhciopOworaW50IHRlc3R1dGlsc19yZWxhdGl2ZV9jaGRpcihjb25zdCBnY2hhciAqdGFy Z2V0RmlsZW5hbWUsIGNvbnN0IGdjaGFyICpleGVjdXRhYmxlUGF0aCk7Cg==