--- src/rrd_cgi.c.dist	2009-11-15 12:54:23.000000000 +0100
+++ src/rrd_cgi.c	2010-01-28 11:00:54.000000000 +0100
@@ -988,7 +988,7 @@
         if (buf == NULL) {
             return stralloc("[ERROR: allocating strftime buffer]");
         };
-        last = rrd_last(argc + 1, (char **) args - 1);
+        last = rrd_last_r(args[0]);
         if (rrd_test_error()) {
             char     *err =
                 malloc((strlen(rrd_get_error()) +