OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

66 lines
2.0 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../rrdtool/rrdtool-1.2.19-rrdcgi.patch
  5. # Copyright (C) 2007 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. Printstrftime on rrd_cgi.c returns an illegal value.
  17. It causes segmentation fault error. (Tatsuki Makino tatsuki_makino hotmail.com)
  18. --- ./src/rrd_cgi.c (Revision 1000)
  19. +++ ./src/rrd_cgi.c (Revision 1001)
  20. @@ -574,7 +574,7 @@
  21. /* Make sure that we were given the right number of args */
  22. if( argc != 4) {
  23. rrd_set_error( "wrong number of args %d", argc);
  24. - return (char *) -1;
  25. + return stralloc("");
  26. }
  27. /* Init start and end time */
  28. @@ -584,14 +584,14 @@
  29. /* Parse the start and end times we were given */
  30. if( (parsetime_error = parsetime( args[1], &start_tv))) {
  31. rrd_set_error( "start time: %s", parsetime_error);
  32. - return (char *) -1;
  33. + return stralloc("");
  34. }
  35. if( (parsetime_error = parsetime( args[2], &end_tv))) {
  36. rrd_set_error( "end time: %s", parsetime_error);
  37. - return (char *) -1;
  38. + return stralloc("");
  39. }
  40. if( proc_start_end( &start_tv, &end_tv, &start_tmp, &end_tmp) == -1) {
  41. - return (char *) -1;
  42. + return stralloc("");
  43. }
  44. /* Do we do the start or end */
  45. @@ -603,7 +603,7 @@
  46. }
  47. else {
  48. rrd_set_error( "start/end not found in '%s'", args[0]);
  49. - return (char *) -1;
  50. + return stralloc("");
  51. }
  52. /* now format it */
  53. @@ -612,7 +612,7 @@
  54. }
  55. else {
  56. rrd_set_error( "strftime failed");
  57. - return (char *) -1;
  58. + return stralloc("");
  59. }
  60. }