[Perfparse-cvs] _perfparse/modules Makefile.in, 1.22, 1.23 storage_mysql.c, 1.23, 1.24

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/perfparse/_perfparse/modules
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4196/modules

Modified Files:
	Makefile.in storage_mysql.c 
Log Message:
Fixed a buffer overflow with long service/metric names (FG)
Thanks to Jamie Garcia

Index: Makefile.in
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/modules/Makefile.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Makefile.in	3 Jan 2008 22:04:44 -0000	1.22
--- Makefile.in	9 Nov 2008 00:14:31 -0000	1.23
***************
*** 1,7 ****
! # Makefile.in generated by automake 1.10 from Makefile.am.
  # @configure_input@

  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.10.1 from Makefile.am.
  # @configure_input@

  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
! # 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
***************
*** 137,141 ****
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(libpp_storage_stdout_la_LDFLAGS) $(LDFLAGS) -o $@
! DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
--- 137,141 ----
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(libpp_storage_stdout_la_LDFLAGS) $(LDFLAGS) -o $@
! DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
***************
*** 189,192 ****
--- 189,193 ----
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
+ DSYMUTIL = @DSYMUTIL@
  ECHO = @ECHO@
  ECHO_C = @ECHO_C@
***************
*** 247,250 ****
--- 248,252 ----
  MYSQL_CONFIG = @MYSQL_CONFIG@
  MYSQL_LIBS = @MYSQL_LIBS@
+ NMEDIT = @NMEDIT@
  OBJEXT = @OBJEXT@
  PACKAGE = @PACKAGE@
***************
*** 415,420 ****
  	  if test -f $$p; then \
  	    f=$(am__strip_dir) \
! 	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
! 	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
  	  else :; fi; \
  	done
--- 417,422 ----
  	  if test -f $$p; then \
  	    f=$(am__strip_dir) \
! 	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
! 	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
  	  else :; fi; \
  	done
***************
*** 424,429 ****
  	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
  	  p=$(am__strip_dir) \
! 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
! 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
  	done

--- 426,431 ----
  	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
  	  p=$(am__strip_dir) \
! 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
! 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
  	done

***************
*** 602,607 ****
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
! 	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
  tags: TAGS
--- 604,609 ----
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
! 	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
! 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
  	mkid -fID $$unique
  tags: TAGS
***************
*** 615,620 ****
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
! 	       END { for (i in files) print i; }'`; \
  	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
--- 617,622 ----
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
! 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
! 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
  	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
***************
*** 626,636 ****
  		$(TAGS_FILES) $(LISP)
  	tags=; \
- 	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
! 	       END { for (i in files) print i; }'`; \
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
--- 628,637 ----
  		$(TAGS_FILES) $(LISP)
  	tags=; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
! 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
! 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

Index: storage_mysql.c
===================================================================
RCS file: /cvsroot/perfparse/_perfparse/modules/storage_mysql.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** storage_mysql.c	24 Apr 2008 22:29:09 -0000	1.23
--- storage_mysql.c	9 Nov 2008 00:14:31 -0000	1.24
***************
*** 518,526 ****

  	static int *iMetricID, iTestMetric;
! 	static char sHash[200];
  	static char *sKey;

  	/* Have we seen this one before? */
! 	sprintf(sHash, "%100s:%45s:%45s", sMetric, sService, sHost);
  	iMetricID = g_tree_lookup(validated_metrics, sHash);
  	if (iMetricID) return *iMetricID;
--- 518,526 ----

  	static int *iMetricID, iTestMetric;
! 	static char sHash[251];
  	static char *sKey;

  	/* Have we seen this one before? */
! 	sprintf(sHash, "%75s:%75s:%100s", sMetric, sService, sHost);
  	iMetricID = g_tree_lookup(validated_metrics, sHash);
  	if (iMetricID) return *iMetricID;