[goffice] Graphs: fuzzed file fixes re axis maps.



commit 61c564b2cdb1fed94f4bf0d3357f9914d15cb39c
Author: Morten Welinder <terra gnome org>
Date:   Sat Jun 20 20:23:25 2015 -0400

    Graphs: fuzzed file fixes re axis maps.

 ChangeLog                     |    8 ++++++++
 NEWS                          |    5 +++--
 goffice/graph/gog-chart-map.c |    1 +
 goffice/graph/gog-grid-line.c |    3 +++
 4 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f41bae9..7685e7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,14 @@
        * plugins/plot_xy/gog-xy.c (gog_xy_view_render): protect against wrong
        series element index. [#751256]
 
+2015-06-20  Morten Welinder  <terra gnome org>
+
+       * goffice/graph/gog-grid-line.c (gog_grid_line_radial_render):
+       Survive missing parameters.
+
+       * goffice/graph/gog-chart-map.c (null_map_2D): Zero output
+       variables.
+
 2015-06-19  Jean Brefort  <jean brefort normalesup org>
 
        * plugins/plot_barcol/gog-barcol.c (gog_barcol_view_render): protect
diff --git a/NEWS b/NEWS
index c3bf7e2..c44bf3c 100644
--- a/NEWS
+++ b/NEWS
@@ -2,14 +2,15 @@ goffice 0.10.23:
 
 Jean:
        * Disable metafiles support when there is no screen. [#748493]
-       * Fuzzed file fix.  [#750860] [#751059] [#751256] [#751257] [#751272]
+       * Fuzzed file fixes.  [#750860] [#751059] [#751256] [#751257] [#751272]
+       * Fuzzed file fixes.  [#750860] [#751059]
 
 Morten:
        * Fix ABR [#749167]
        * Shield Cairo from image sizes it cannot handle.  [#749274]
        * Plug leaks.  [#749395]
        * Portability problem affecting macs.  [#749463]
-       * Fuzzed file fix.  [#750047]
+       * Fuzzed file fixes.  [#750047]  [#751250]
 
 --------------------------------------------------------------------------
 goffice 0.10.22:
diff --git a/goffice/graph/gog-chart-map.c b/goffice/graph/gog-chart-map.c
index cd205a6..6655141 100644
--- a/goffice/graph/gog-chart-map.c
+++ b/goffice/graph/gog-chart-map.c
@@ -164,6 +164,7 @@ static void
 null_map_2D (GogChartMap *map, double x, double y, double *u, double *v)
 {
        g_warning ("[GogChartMap::map_2D] not implemented");
+       *u = *v = 0;
 }
 
 typedef struct {
diff --git a/goffice/graph/gog-grid-line.c b/goffice/graph/gog-grid-line.c
index b1fe62d..b87b07f 100644
--- a/goffice/graph/gog-grid-line.c
+++ b/goffice/graph/gog-grid-line.c
@@ -609,6 +609,9 @@ gog_grid_line_radial_render (GogGridLine *grid_line, GogView *view,
                                   circular_axis, axis, NULL, FALSE);
 
        parms = gog_chart_map_get_polar_parms (c_map);
+       if (!parms)
+               return;
+
        path = go_path_new ();
 
        if (gog_axis_is_discrete (circular_axis)) {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]