forked from pool/transfig
54 lines
2.3 KiB
Diff
54 lines
2.3 KiB
Diff
Index: transfig.3.2.5e/fig2dev/read1_3.c
|
|
===================================================================
|
|
---
|
|
fig2dev-3.2.6/fig2dev/alloc.h | 20 ++++++++++----------
|
|
fig2dev-3.2.6/fig2dev/read1_3.c | 2 ++
|
|
2 files changed, 12 insertions(+), 10 deletions(-)
|
|
|
|
--- fig2dev-3.2.6/fig2dev/alloc.h
|
|
+++ fig2dev-3.2.6/fig2dev/alloc.h 2016-09-22 13:09:20.789406849 +0000
|
|
@@ -13,15 +13,15 @@
|
|
* notice remain intact.
|
|
*/
|
|
|
|
-#define Line_malloc(z) z = (F_line*)malloc(LINOBJ_SIZE)
|
|
-#define Pic_malloc(z) z = (F_pic*)malloc(PIC_SIZE)
|
|
-#define Spline_malloc(z) z = (F_spline*)malloc(SPLOBJ_SIZE)
|
|
-#define Ellipse_malloc(z) z = (F_ellipse*)malloc(ELLOBJ_SIZE)
|
|
-#define Arc_malloc(z) z = (F_arc*)malloc(ARCOBJ_SIZE)
|
|
-#define Compound_malloc(z) z = (F_compound*)malloc(COMOBJ_SIZE)
|
|
-#define Text_malloc(z) z = (F_text*)malloc(TEXOBJ_SIZE)
|
|
-#define Point_malloc(z) z = (F_point*)malloc(POINT_SIZE)
|
|
-#define Control_malloc(z) z = (F_control*)malloc(CONTROL_SIZE)
|
|
-#define Arrow_malloc(z) z = (F_arrow*)malloc(ARROW_SIZE)
|
|
+#define Line_malloc(z) z = (F_line*)calloc(LINOBJ_SIZE,1)
|
|
+#define Pic_malloc(z) z = (F_pic*)calloc(PIC_SIZE,1)
|
|
+#define Spline_malloc(z) z = (F_spline*)calloc(SPLOBJ_SIZE,1)
|
|
+#define Ellipse_malloc(z) z = (F_ellipse*)calloc(ELLOBJ_SIZE,1)
|
|
+#define Arc_malloc(z) z = (F_arc*)calloc(ARCOBJ_SIZE,1)
|
|
+#define Compound_malloc(z) z = (F_compound*)calloc(COMOBJ_SIZE,1)
|
|
+#define Text_malloc(z) z = (F_text*)calloc(TEXOBJ_SIZE,1)
|
|
+#define Point_malloc(z) z = (F_point*)calloc(POINT_SIZE,1)
|
|
+#define Control_malloc(z) z = (F_control*)calloc(CONTROL_SIZE,1)
|
|
+#define Arrow_malloc(z) z = (F_arrow*)calloc(ARROW_SIZE,1)
|
|
|
|
extern char Err_mem[];
|
|
--- fig2dev-3.2.6/fig2dev/read1_3.c
|
|
+++ fig2dev-3.2.6/fig2dev/read1_3.c 2016-09-22 13:10:28.012139567 +0000
|
|
@@ -334,6 +334,7 @@ read_lineobject(FILE *fp)
|
|
l->back_arrow = NULL;
|
|
l->next = NULL;
|
|
l->points = Point_malloc(p);
|
|
+ l->points->next = NULL;
|
|
n = fscanf(fp, " %d %d %d %lf %d %d %d %d %d %d", &t,
|
|
&l->style, &l->thickness, &l->style_val,
|
|
&f, &b, &h, &w, &p->x, &p->y);
|
|
@@ -392,6 +393,7 @@ read_splineobject(FILE *fp)
|
|
s->controls = NULL;
|
|
s->next = NULL;
|
|
s->points = Point_malloc(p);
|
|
+ s->points->next = NULL;
|
|
n = fscanf(fp, " %d %d %d %lf %d %d %d %d %d %d",
|
|
&t, &s->style, &s->thickness, &s->style_val,
|
|
&f, &b,
|