diff --git a/ChangeLog b/ChangeLog index b886d065e..0b7e6fc58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri May 19 11:37:54 2000 Tim Janik + + * gutils.c (g_snprintf): + (g_vsnprintf): added argument assertments. + + * gstring.c (g_string_assign): + (g_string_truncate): added argument assertments. + Fri May 19 09:00:44 2000 Tim Janik * gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index b886d065e..0b7e6fc58 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +Fri May 19 11:37:54 2000 Tim Janik + + * gutils.c (g_snprintf): + (g_vsnprintf): added argument assertments. + + * gstring.c (g_string_assign): + (g_string_truncate): added argument assertments. + Fri May 19 09:00:44 2000 Tim Janik * gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b886d065e..0b7e6fc58 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Fri May 19 11:37:54 2000 Tim Janik + + * gutils.c (g_snprintf): + (g_vsnprintf): added argument assertments. + + * gstring.c (g_string_assign): + (g_string_truncate): added argument assertments. + Fri May 19 09:00:44 2000 Tim Janik * gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index b886d065e..0b7e6fc58 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +Fri May 19 11:37:54 2000 Tim Janik + + * gutils.c (g_snprintf): + (g_vsnprintf): added argument assertments. + + * gstring.c (g_string_assign): + (g_string_truncate): added argument assertments. + Fri May 19 09:00:44 2000 Tim Janik * gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b886d065e..0b7e6fc58 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Fri May 19 11:37:54 2000 Tim Janik + + * gutils.c (g_snprintf): + (g_vsnprintf): added argument assertments. + + * gstring.c (g_string_assign): + (g_string_truncate): added argument assertments. + Fri May 19 09:00:44 2000 Tim Janik * gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b886d065e..0b7e6fc58 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Fri May 19 11:37:54 2000 Tim Janik + + * gutils.c (g_snprintf): + (g_vsnprintf): added argument assertments. + + * gstring.c (g_string_assign): + (g_string_truncate): added argument assertments. + Fri May 19 09:00:44 2000 Tim Janik * gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b886d065e..0b7e6fc58 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Fri May 19 11:37:54 2000 Tim Janik + + * gutils.c (g_snprintf): + (g_vsnprintf): added argument assertments. + + * gstring.c (g_string_assign): + (g_string_truncate): added argument assertments. + Fri May 19 09:00:44 2000 Tim Janik * gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b886d065e..0b7e6fc58 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Fri May 19 11:37:54 2000 Tim Janik + + * gutils.c (g_snprintf): + (g_vsnprintf): added argument assertments. + + * gstring.c (g_string_assign): + (g_string_truncate): added argument assertments. + Fri May 19 09:00:44 2000 Tim Janik * gmem.c (g_free): fixed SIZEOF_LONG==4 assumption with diff --git a/glib/gstring.c b/glib/gstring.c index 2274a6a23..a7ed5c6e0 100644 --- a/glib/gstring.c +++ b/glib/gstring.c @@ -258,6 +258,9 @@ GString* g_string_assign (GString *lval, const gchar *rval) { + g_return_val_if_fail (lval != NULL, NULL); + g_return_val_if_fail (rval != NULL, NULL); + g_string_truncate (lval, 0); g_string_append (lval, rval); @@ -271,6 +274,7 @@ g_string_truncate (GString* fstring, GRealString *string = (GRealString*)fstring; g_return_val_if_fail (string != NULL, NULL); + g_return_val_if_fail (len >= 0, NULL); string->len = len; diff --git a/glib/gutils.c b/glib/gutils.c index 6d1f2b516..a52baaac0 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -136,6 +136,10 @@ g_snprintf (gchar *str, va_list args; gint retval; + g_return_val_if_fail (str != NULL, 0); + g_return_val_if_fail (n > 0, 0); + g_return_val_if_fail (fmt != NULL, 0); + va_start (args, fmt); retval = vsnprintf (str, n, fmt, args); va_end (args); @@ -151,6 +155,10 @@ g_snprintf (gchar *str, gchar *printed; va_list args; + g_return_val_if_fail (str != NULL, 0); + g_return_val_if_fail (n > 0, 0); + g_return_val_if_fail (fmt != NULL, 0); + va_start (args, fmt); printed = g_strdup_vprintf (fmt, args); va_end (args); @@ -172,6 +180,10 @@ g_vsnprintf (gchar *str, { #ifdef HAVE_VSNPRINTF gint retval; + + g_return_val_if_fail (str != NULL, 0); + g_return_val_if_fail (n > 0, 0); + g_return_val_if_fail (fmt != NULL, 0); retval = vsnprintf (str, n, fmt, args); @@ -185,6 +197,10 @@ g_vsnprintf (gchar *str, #else /* !HAVE_VSNPRINTF */ gchar *printed; + g_return_val_if_fail (str != NULL, 0); + g_return_val_if_fail (n > 0, 0); + g_return_val_if_fail (fmt != NULL, 0); + printed = g_strdup_vprintf (fmt, args); strncpy (str, printed, n); str[n-1] = '\0'; diff --git a/gstring.c b/gstring.c index 2274a6a23..a7ed5c6e0 100644 --- a/gstring.c +++ b/gstring.c @@ -258,6 +258,9 @@ GString* g_string_assign (GString *lval, const gchar *rval) { + g_return_val_if_fail (lval != NULL, NULL); + g_return_val_if_fail (rval != NULL, NULL); + g_string_truncate (lval, 0); g_string_append (lval, rval); @@ -271,6 +274,7 @@ g_string_truncate (GString* fstring, GRealString *string = (GRealString*)fstring; g_return_val_if_fail (string != NULL, NULL); + g_return_val_if_fail (len >= 0, NULL); string->len = len; diff --git a/gutils.c b/gutils.c index 6d1f2b516..a52baaac0 100644 --- a/gutils.c +++ b/gutils.c @@ -136,6 +136,10 @@ g_snprintf (gchar *str, va_list args; gint retval; + g_return_val_if_fail (str != NULL, 0); + g_return_val_if_fail (n > 0, 0); + g_return_val_if_fail (fmt != NULL, 0); + va_start (args, fmt); retval = vsnprintf (str, n, fmt, args); va_end (args); @@ -151,6 +155,10 @@ g_snprintf (gchar *str, gchar *printed; va_list args; + g_return_val_if_fail (str != NULL, 0); + g_return_val_if_fail (n > 0, 0); + g_return_val_if_fail (fmt != NULL, 0); + va_start (args, fmt); printed = g_strdup_vprintf (fmt, args); va_end (args); @@ -172,6 +180,10 @@ g_vsnprintf (gchar *str, { #ifdef HAVE_VSNPRINTF gint retval; + + g_return_val_if_fail (str != NULL, 0); + g_return_val_if_fail (n > 0, 0); + g_return_val_if_fail (fmt != NULL, 0); retval = vsnprintf (str, n, fmt, args); @@ -185,6 +197,10 @@ g_vsnprintf (gchar *str, #else /* !HAVE_VSNPRINTF */ gchar *printed; + g_return_val_if_fail (str != NULL, 0); + g_return_val_if_fail (n > 0, 0); + g_return_val_if_fail (fmt != NULL, 0); + printed = g_strdup_vprintf (fmt, args); strncpy (str, printed, n); str[n-1] = '\0';