toolchains: branch master updated. 76a6a4e439b9a10b814d5eb79a7f4f7251b6ded9
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/76a6a4e439b9a10b81...
...commit http://git.netsurf-browser.org/toolchains.git/commit/76a6a4e439b9a10b814d...
...tree http://git.netsurf-browser.org/toolchains.git/tree/76a6a4e439b9a10b814d5e...
The branch, master has been updated
via 76a6a4e439b9a10b814d5eb79a7f4f7251b6ded9 (commit)
from 903727aa699111498652e4926f360aa0a6e4921e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=76a6a4e439b9a10b...
commit 76a6a4e439b9a10b814d5eb79a7f4f7251b6ded9
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Update ppc amigaos ndk for toolchain
diff --git a/ppc-amigaos/Makefile b/ppc-amigaos/Makefile
index b6f8eef..14ca3df 100644
--- a/ppc-amigaos/Makefile
+++ b/ppc-amigaos/Makefile
@@ -18,8 +18,8 @@ UPSTREAM_MPC_VERSION := 1.0.2
UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz
UPSTREAM_MPC_URI := http://ftp.gnu.org/gnu/mpc/$(UPSTREAM_MPC_TARBALL)
-UPSTREAM_NDK_TARBALL := SDK_53.29.lha
-UPSTREAM_NDK_URI := "http://hyperion-entertainment.biz/index.php/downloads?view=download&forma..."
+UPSTREAM_NDK_TARBALL := SDK_54.16.lha
+UPSTREAM_NDK_URI := "http://hyperion-entertainment.biz/index.php/downloads?view=download&forma..."
UPSTREAM_NDK_UPDATE_TARBALL := SDK_addon_final_edition_update2.zip
UPSTREAM_NDK_UPDATE_URI := http://kas1e.mikendezign.com/aos4/SDK_addon_final_edition_update2.zip
@@ -96,9 +96,9 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTR
mkdir -p $(BUILDDIR)/ndk/tmp/
lha xw=$(BUILDDIR)/ndk $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/base.lha
- lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/newlib-53.30.lha
- lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/clib2-1.206.lha
- lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/pthreads-53.11.lha
+ lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/newlib-53.80.lha
+ lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/clib2.lha
+ lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/pthreads-53.12.lha
lha xw=$(BUILDDIR)/ndk/tmp $(SOURCESDIR)/$(UPSTREAM_ONCHIPMEM_TARBALL)
mkdir -p $(PREFIX)/$(TARGET_NAME)/SDK
unzip -o $(SOURCESDIR)/$(UPSTREAM_NDK_UPDATE_TARBALL) -d $(BUILDDIR)/ndk/tmp
-----------------------------------------------------------------------
Summary of changes:
ppc-amigaos/Makefile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ppc-amigaos/Makefile b/ppc-amigaos/Makefile
index b6f8eef..14ca3df 100644
--- a/ppc-amigaos/Makefile
+++ b/ppc-amigaos/Makefile
@@ -18,8 +18,8 @@ UPSTREAM_MPC_VERSION := 1.0.2
UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz
UPSTREAM_MPC_URI := http://ftp.gnu.org/gnu/mpc/$(UPSTREAM_MPC_TARBALL)
-UPSTREAM_NDK_TARBALL := SDK_53.29.lha
-UPSTREAM_NDK_URI := "http://hyperion-entertainment.biz/index.php/downloads?view=download&forma..."
+UPSTREAM_NDK_TARBALL := SDK_54.16.lha
+UPSTREAM_NDK_URI := "http://hyperion-entertainment.biz/index.php/downloads?view=download&forma..."
UPSTREAM_NDK_UPDATE_TARBALL := SDK_addon_final_edition_update2.zip
UPSTREAM_NDK_UPDATE_URI := http://kas1e.mikendezign.com/aos4/SDK_addon_final_edition_update2.zip
@@ -96,9 +96,9 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTR
mkdir -p $(BUILDDIR)/ndk/tmp/
lha xw=$(BUILDDIR)/ndk $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/base.lha
- lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/newlib-53.30.lha
- lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/clib2-1.206.lha
- lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/pthreads-53.11.lha
+ lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/newlib-53.80.lha
+ lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/clib2.lha
+ lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/pthreads-53.12.lha
lha xw=$(BUILDDIR)/ndk/tmp $(SOURCESDIR)/$(UPSTREAM_ONCHIPMEM_TARBALL)
mkdir -p $(PREFIX)/$(TARGET_NAME)/SDK
unzip -o $(SOURCESDIR)/$(UPSTREAM_NDK_UPDATE_TARBALL) -d $(BUILDDIR)/ndk/tmp
--
Cross-compilation toolchains and environments
3 months
- 1
- 0
libsvgtiny: branch master updated. release/0.1.7-5-g9c76afd
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/libsvgtiny.git/shortlog/9c76afd8afc61e8f2f...
...commit http://git.netsurf-browser.org/libsvgtiny.git/commit/9c76afd8afc61e8f2fe3...
...tree http://git.netsurf-browser.org/libsvgtiny.git/tree/9c76afd8afc61e8f2fe3a6...
The branch, master has been updated
via 9c76afd8afc61e8f2fe3a634d3110b786b43b58e (commit)
via 088329388d215b3476bc3178e3cdc0ffbb0e951a (commit)
via 0630606336898622a4a2d7f6a9739cef0d7f6028 (commit)
via ced1bcad78ea063413b302a413e2747f81321e12 (commit)
from f66051cab457438eefd23e1e2c6e2197894b2d52 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/libsvgtiny.git/commit/?id=9c76afd8afc61e8f...
commit 9c76afd8afc61e8f2fe3a634d3110b786b43b58e
Author: Michael Orlitzky <michael(a)orlitzky.com>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
examples/svgtiny_display_x11.c: include the system copy of svgtiny.h
The header of this file includes instructions for how to build it:
Compile using:
gcc -g -W -Wall -o svgtiny_display_x11 svgtiny_display_x11.c \
`pkg-config --cflags --libs libsvgtiny cairo` -lX11
That pkg-config command will generate the flags to link against the
installed copy of libsvgtiny. The line,
#include "svgtiny.h"
on the other hand, attempts to use a local header. This commit changes
that line to,
#include <svgtiny.h>
which will use the corresponding system header from whatever include
directory pkg-config hands us for libsvgtiny.
diff --git a/examples/svgtiny_display_x11.c b/examples/svgtiny_display_x11.c
index 6758bef..463beb8 100644
--- a/examples/svgtiny_display_x11.c
+++ b/examples/svgtiny_display_x11.c
@@ -32,7 +32,7 @@
#include <X11/keysym.h>
#include <cairo.h>
#include <cairo-xlib.h>
-#include "svgtiny.h"
+#include <svgtiny.h>
struct svgtiny_diagram *diagram;
commitdiff http://git.netsurf-browser.org/libsvgtiny.git/commit/?id=088329388d215b34...
commit 088329388d215b3476bc3178e3cdc0ffbb0e951a
Author: Michael Orlitzky <michael(a)orlitzky.com>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
examples/svgtiny_display_x11.c: add missing stdlib.h include
This file uses malloc(), free(), and exit() -- all of which are
defined in stdlib.h. GCC seems unhappy about the situation, so we now
include it. This allows the file to be compiled once again.
diff --git a/examples/svgtiny_display_x11.c b/examples/svgtiny_display_x11.c
index c8bafd5..6758bef 100644
--- a/examples/svgtiny_display_x11.c
+++ b/examples/svgtiny_display_x11.c
@@ -23,6 +23,7 @@
#include <math.h>
#include <stdbool.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
commitdiff http://git.netsurf-browser.org/libsvgtiny.git/commit/?id=0630606336898622...
commit 0630606336898622a4a2d7f6a9739cef0d7f6028
Author: Michael Orlitzky <michael(a)orlitzky.com>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
examples/svgtiny_display_x11.c: update LIBXML -> LIBDOM
The svgtiny_LIBXML_ERROR constant was changed to throughout the
codebase to svgtiny_LIBDOM_ERROR a long time ago, in 9275ab308, but
this example was missed, probably because it isn't built by default.
diff --git a/examples/svgtiny_display_x11.c b/examples/svgtiny_display_x11.c
index d10bfbc..c8bafd5 100644
--- a/examples/svgtiny_display_x11.c
+++ b/examples/svgtiny_display_x11.c
@@ -114,8 +114,8 @@ int main(int argc, char *argv[])
case svgtiny_OUT_OF_MEMORY:
fprintf(stderr, "svgtiny_OUT_OF_MEMORY");
break;
- case svgtiny_LIBXML_ERROR:
- fprintf(stderr, "svgtiny_LIBXML_ERROR");
+ case svgtiny_LIBDOM_ERROR:
+ fprintf(stderr, "svgtiny_LIBDOM_ERROR");
break;
case svgtiny_NOT_SVG:
fprintf(stderr, "svgtiny_NOT_SVG");
commitdiff http://git.netsurf-browser.org/libsvgtiny.git/commit/?id=ced1bcad78ea0634...
commit ced1bcad78ea063413b302a413e2747f81321e12
Author: Michael Orlitzky <michael(a)orlitzky.com>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
README: update LIBXML -> LIBDOM
This constant svgtiny_LIBXML_ERROR was changed throughout the codebase
to svgtiny_LIBDOM_ERROR a long time ago, in 9275ab308, but the README
was missed because nobody reads the documentation :)
diff --git a/README b/README
index 3c5095a..82a5df8 100644
--- a/README
+++ b/README
@@ -160,7 +160,7 @@ returned, but the diagram is still valid up to the point of the
error. The error is recorded in diagram->error_message and the line
that caused it in diagram->error_line.
-svgtiny_LIBXML_ERROR indicates that parsing the XML failed. The
+svgtiny_LIBDOM_ERROR indicates that parsing the XML failed. The
returned diagram will contain no shapes. svgtiny_NOT_SVG means that
the XML did not contain a top-level <svg> element.
-----------------------------------------------------------------------
Summary of changes:
README | 2 +-
examples/svgtiny_display_x11.c | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/README b/README
index 3c5095a..82a5df8 100644
--- a/README
+++ b/README
@@ -160,7 +160,7 @@ returned, but the diagram is still valid up to the point of the
error. The error is recorded in diagram->error_message and the line
that caused it in diagram->error_line.
-svgtiny_LIBXML_ERROR indicates that parsing the XML failed. The
+svgtiny_LIBDOM_ERROR indicates that parsing the XML failed. The
returned diagram will contain no shapes. svgtiny_NOT_SVG means that
the XML did not contain a top-level <svg> element.
diff --git a/examples/svgtiny_display_x11.c b/examples/svgtiny_display_x11.c
index d10bfbc..463beb8 100644
--- a/examples/svgtiny_display_x11.c
+++ b/examples/svgtiny_display_x11.c
@@ -23,6 +23,7 @@
#include <math.h>
#include <stdbool.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -31,7 +32,7 @@
#include <X11/keysym.h>
#include <cairo.h>
#include <cairo-xlib.h>
-#include "svgtiny.h"
+#include <svgtiny.h>
struct svgtiny_diagram *diagram;
@@ -114,8 +115,8 @@ int main(int argc, char *argv[])
case svgtiny_OUT_OF_MEMORY:
fprintf(stderr, "svgtiny_OUT_OF_MEMORY");
break;
- case svgtiny_LIBXML_ERROR:
- fprintf(stderr, "svgtiny_LIBXML_ERROR");
+ case svgtiny_LIBDOM_ERROR:
+ fprintf(stderr, "svgtiny_LIBDOM_ERROR");
break;
case svgtiny_NOT_SVG:
fprintf(stderr, "svgtiny_NOT_SVG");
--
NetSurf SVG decoder
3 months, 3 weeks
- 1
- 0
libdom: branch master updated. release/0.4.1-27-g176bab6
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/libdom.git/shortlog/176bab60eb10beb68fbbb1...
...commit http://git.netsurf-browser.org/libdom.git/commit/176bab60eb10beb68fbbb1a6...
...tree http://git.netsurf-browser.org/libdom.git/tree/176bab60eb10beb68fbbb1a618...
The branch, master has been updated
via 176bab60eb10beb68fbbb1a6185c68eeda2a6e95 (commit)
from 16c5256395aa4d48a50ffed5b5748d30fd04b3e5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=176bab60eb10beb68fbb...
commit 176bab60eb10beb68fbbb1a6185c68eeda2a6e95
Author: Michael Orlitzky <michael(a)orlitzky.com>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
bindings/xml/libxml_xmlparser.c: handle an empty document
The xml_parser_end_document() function tries to retrieve the XML node
using dom_node_get_user_data() after the parser has finished. It
checks the return value of that function, but not the true result (a
node pointer), which is itself passed in via a pointer. This goes
wrong when the returned pointer is NULL and unusable, because the
return value is always DOM_NO_ERR (meaning everything was OK).
This problem manifests as a segfault (null dereference) if you try to
parse an empty document using the libxml bindings. It is fixed by
adding a NULL check.
diff --git a/bindings/xml/libxml_xmlparser.c b/bindings/xml/libxml_xmlparser.c
index 02b8a34..d43c459 100644
--- a/bindings/xml/libxml_xmlparser.c
+++ b/bindings/xml/libxml_xmlparser.c
@@ -346,7 +346,11 @@ void xml_parser_end_document(void *ctx)
/* Get XML node */
err = dom_node_get_user_data((struct dom_node *) parser->doc,
parser->udkey, (void **) (void *) &node);
- if (err != DOM_NO_ERR) {
+
+ /* The return value from dom_node_get_user_data() is always
+ * DOM_NO_ERR, but the returned "node" will be NULL if no user
+ * data is found. */
+ if (err != DOM_NO_ERR || node == NULL) {
parser->msg(DOM_MSG_WARNING, parser->mctx,
"Failed finding XML node");
return;
-----------------------------------------------------------------------
Summary of changes:
bindings/xml/libxml_xmlparser.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/bindings/xml/libxml_xmlparser.c b/bindings/xml/libxml_xmlparser.c
index 02b8a34..d43c459 100644
--- a/bindings/xml/libxml_xmlparser.c
+++ b/bindings/xml/libxml_xmlparser.c
@@ -346,7 +346,11 @@ void xml_parser_end_document(void *ctx)
/* Get XML node */
err = dom_node_get_user_data((struct dom_node *) parser->doc,
parser->udkey, (void **) (void *) &node);
- if (err != DOM_NO_ERR) {
+
+ /* The return value from dom_node_get_user_data() is always
+ * DOM_NO_ERR, but the returned "node" will be NULL if no user
+ * data is found. */
+ if (err != DOM_NO_ERR || node == NULL) {
parser->msg(DOM_MSG_WARNING, parser->mctx,
"Failed finding XML node");
return;
--
Document Object Model library
3 months, 3 weeks
- 1
- 0
- ← Newer
- 1
- Older →