Changeset 20756

Timestamp:

2009-09-30T10:29:12+13:00 (15 years ago)

Author:

mdewsnip

Message:

Fixed memory bug (causing crash on some Windows machines) in format_date(), found by Valgrind.

File:

• gsdl/trunk/runtime-src/src/recpt/formattools.cpp (modified) (2 diffs)

gsdl/trunk/runtime-src/src/recpt/formattools.cpp

@@ -192 +192 @@
   text_t year = substr (datebegin, datebegin+4);
   int chars_seen_so_far = 4;
+  if (chars_seen_so_far == date.size()) return "_format:date_("+year+")";
 
   if (date[chars_seen_so_far] == '-') ++chars_seen_so_far ;
@@ -201 +202 @@
  
   chars_seen_so_far += 2;
+  if (chars_seen_so_far == date.size()) return "_format:date_("+year+","+month+")";
+
   if (date[chars_seen_so_far] == '-') ++chars_seen_so_far ;
-  
   if (date.size() < chars_seen_so_far+2) return "_format:date_("+year+","+month+")";