mirror of
https://github.com/fltk/fltk.git
synced 2026-06-06 00:22:42 +08:00
Make sure menu item array is cleared to avoid uninitialized memory
accesses... Fixes for manpage rules... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1369 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
+9
-5
@@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# "$Id: makeinclude.in,v 1.7.2.9 2001/02/12 15:12:14 easysw Exp $"
|
# "$Id: makeinclude.in,v 1.7.2.10 2001/02/12 15:34:37 easysw Exp $"
|
||||||
#
|
#
|
||||||
# Make include file for the Fast Light Tool Kit (FLTK).
|
# Make include file for the Fast Light Tool Kit (FLTK).
|
||||||
# @configure_input@
|
# @configure_input@
|
||||||
@@ -58,6 +58,10 @@ DSOCOMMAND =@DSOCOMMAND@
|
|||||||
LDLIBS =@LDFLAGS@ @LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
|
LDLIBS =@LDFLAGS@ @LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
|
||||||
GLDLIBS =@LDFLAGS@ @LIBS@ @GLLIB@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
|
GLDLIBS =@LDFLAGS@ @LIBS@ @GLLIB@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
|
||||||
|
|
||||||
|
# Man page extensions...
|
||||||
|
CAT1EXT =@CAT1EXT@
|
||||||
|
CAT3EXT =@CAT3EXT@
|
||||||
|
|
||||||
# Be quiet when building...
|
# Be quiet when building...
|
||||||
.SILENT:
|
.SILENT:
|
||||||
|
|
||||||
@@ -78,16 +82,16 @@ GLDLIBS =@LDFLAGS@ @LIBS@ @GLLIB@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
|
|||||||
|
|
||||||
.man.0 .man.1 .man.3:
|
.man.0 .man.1 .man.3:
|
||||||
echo Formatting $<...
|
echo Formatting $<...
|
||||||
$(RM) $@
|
rm -f $@
|
||||||
$(NROFF) -man $< >$@
|
$(NROFF) -man $< >$@
|
||||||
|
|
||||||
.man.z:
|
.man.z:
|
||||||
echo Formatting $<...
|
echo Formatting $<...
|
||||||
$(RM) $@ t.z
|
rm -f $@ t.z
|
||||||
$(NROFF) -man $< >t
|
$(NROFF) -man $< >t
|
||||||
pack -f t
|
pack -f t
|
||||||
$(MV) t.z $@
|
mv t.z $@
|
||||||
|
|
||||||
#
|
#
|
||||||
# End of "$Id: makeinclude.in,v 1.7.2.9 2001/02/12 15:12:14 easysw Exp $".
|
# End of "$Id: makeinclude.in,v 1.7.2.10 2001/02/12 15:34:37 easysw Exp $".
|
||||||
#
|
#
|
||||||
|
|||||||
+3
-2
@@ -1,5 +1,5 @@
|
|||||||
//
|
//
|
||||||
// "$Id: Fl_Menu_add.cxx,v 1.9.2.10 2001/01/22 15:13:40 easysw Exp $"
|
// "$Id: Fl_Menu_add.cxx,v 1.9.2.11 2001/02/12 15:34:37 easysw Exp $"
|
||||||
//
|
//
|
||||||
// Menu utilities for the Fast Light Tool Kit (FLTK).
|
// Menu utilities for the Fast Light Tool Kit (FLTK).
|
||||||
//
|
//
|
||||||
@@ -193,6 +193,7 @@ int Fl_Menu_::add(const char *t, int s, Fl_Callback *c,void *v,int f) {
|
|||||||
} else {
|
} else {
|
||||||
local_array_alloc = 15;
|
local_array_alloc = 15;
|
||||||
local_array = menu_ = new Fl_Menu_Item[local_array_alloc];
|
local_array = menu_ = new Fl_Menu_Item[local_array_alloc];
|
||||||
|
memset(local_array, 0, sizeof(Fl_Menu_Item) * local_array_alloc);
|
||||||
}
|
}
|
||||||
menu_[0].text = 0;
|
menu_[0].text = 0;
|
||||||
local_array_size = 1;
|
local_array_size = 1;
|
||||||
@@ -253,5 +254,5 @@ void Fl_Menu_::remove(int i) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// End of "$Id: Fl_Menu_add.cxx,v 1.9.2.10 2001/01/22 15:13:40 easysw Exp $".
|
// End of "$Id: Fl_Menu_add.cxx,v 1.9.2.11 2001/02/12 15:34:37 easysw Exp $".
|
||||||
//
|
//
|
||||||
|
|||||||
Reference in New Issue
Block a user