Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Jan 2018 02:40:12 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r458012 - in head/lang/spidermonkey24: . files
Message-ID:  <201801040240.w042eC8j008790@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Jan  4 02:40:11 2018
New Revision: 458012
URL: https://svnweb.freebsd.org/changeset/ports/458012

Log:
  lang/spidermonkey24: unbreak build with Clang 6 / GCC 7
  
  js/src/shell/jsoptparse.cpp:256:22: error: comparison between pointer and integer ('char *' and 'int')
          if (value[0] == '\0')
              ~~~~~~~~ ^  ~~~~
  
  Reported by:	antoine (via bug 224669)
  Obtained from:	upstream (SpiderMonkey 25.0)

Added:
  head/lang/spidermonkey24/files/patch-bug894240   (contents, props changed)
Modified:
  head/lang/spidermonkey24/Makefile   (contents, props changed)

Modified: head/lang/spidermonkey24/Makefile
==============================================================================
--- head/lang/spidermonkey24/Makefile	Thu Jan  4 02:23:28 2018	(r458011)
+++ head/lang/spidermonkey24/Makefile	Thu Jan  4 02:40:11 2018	(r458012)
@@ -3,7 +3,7 @@
 
 PORTNAME=		spidermonkey24
 PORTVERSION=		24.2.0
-PORTREVISION=	7
+PORTREVISION=		8
 CATEGORIES=		lang
 MASTER_SITES=		MOZILLA/js
 #http://people.mozilla.org/~sstangl/

Added: head/lang/spidermonkey24/files/patch-bug894240
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/spidermonkey24/files/patch-bug894240	Thu Jan  4 02:40:11 2018	(r458012)
@@ -0,0 +1,20 @@
+commit 19a4ba5c90a9
+Author: Mike Hommey <mh+mozilla@glandium.org>
+Date:   Wed Jul 17 16:16:55 2013 +0900
+
+    Bug 894240 - Fix pointer dereference in js::cli::OptionParser::extractValue. r=Waldo
+---
+ js/src/shell/jsoptparse.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- shell/jsoptparse.cpp.orig	2013-10-29 20:40:20 UTC
++++ shell/jsoptparse.cpp
+@@ -253,7 +253,7 @@ OptionParser::extractValue(size_t argc, char **argv, s
+     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;
+     }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801040240.w042eC8j008790>