summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2017-05-11 16:52:03 -0400
committerIan Stakenvicius <axs@gentoo.org>2017-05-11 16:53:01 -0400
commitb8d5670e2b0fb6cd6d2e0eef71b6acb74beec527 (patch)
treec5284c042416715904287c985b2db0d1b84244a1 /dev-lang/spidermonkey/files
parentdev-db/postgresql: Bump (diff)
downloadgentoo-b8d5670e2b0fb6cd6d2e0eef71b6acb74beec527.tar.gz
gentoo-b8d5670e2b0fb6cd6d2e0eef71b6acb74beec527.tar.bz2
gentoo-b8d5670e2b0fb6cd6d2e0eef71b6acb74beec527.zip
dev-lang/spidermonkey: fix pointer dereference causing c++11 compile error
Backported fix from mozilla25 to spidermonkey-17 and spidermonkey-24. Also bumped spidermonkey-24 EAPI to 6. Bug: http://bugs.gentoo.org/601030 Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'dev-lang/spidermonkey/files')
-rw-r--r--dev-lang/spidermonkey/files/spidermonkey-17-fix_pointer_dereference.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/dev-lang/spidermonkey/files/spidermonkey-17-fix_pointer_dereference.patch b/dev-lang/spidermonkey/files/spidermonkey-17-fix_pointer_dereference.patch
new file mode 100644
index 00000000000..da6a49f637c
--- /dev/null
+++ b/dev-lang/spidermonkey/files/spidermonkey-17-fix_pointer_dereference.patch
@@ -0,0 +1,30 @@
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1373958382 -32400
+# Tue Jul 16 16:06:22 2013 +0900
+# Node ID 1880537f26d2ce22866974a8cdf1927dc66f6dbc
+# Parent 673ea5cd6ba7fc37086d1dab71ee4a6d6a77a1ab
+Bug 894240 - Fix pointer dereference in js::cli::OptionParser::extractValue
+
+diff --git a/js/src/shell/jsoptparse.cpp b/js/src/shell/jsoptparse.cpp
+--- a/js/src/shell/jsoptparse.cpp
++++ b/js/src/shell/jsoptparse.cpp
+@@ -248,17 +248,17 @@ OptionParser::printHelp(const char *prog
+
+ OptionParser::Result
+ OptionParser::extractValue(size_t argc, char **argv, size_t *i, char **value)
+ {
+ JS_ASSERT(*i < argc);
+ char *eq = strchr(argv[*i], '=');
+ if (eq) {
+ *value = eq + 1;
+- if (value[0] == '\0')
++ if (*value[0] == '\0')
+ return error("A value is required for option %.*s", eq - argv[*i], argv[*i]);
+ return Okay;
+ }
+
+ if (argc == *i + 1)
+ return error("Expected a value for option %s", argv[*i]);
+
+ *i += 1;