From dcfed36441f2a937ee8ae1f604b7d1f0a5bc5719 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 16 Oct 2002 21:41:39 +0000 Subject: Fixes #25153 2002-10-15 Rodrigo Moya Fixes #25153 * scripts/mkderivedvalues.pl: changed the _get functions for string values to return a NULL if arguments are wrong * src/libical/icalderivedvalue.c.in (icalvalue_get_x): return from function if pointer checking fails. svn path=/trunk/; revision=18378 --- libical/scripts/mkderivedvalues.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libical/scripts/mkderivedvalues.pl') diff --git a/libical/scripts/mkderivedvalues.pl b/libical/scripts/mkderivedvalues.pl index e7ede34ae7..5009419eac 100755 --- a/libical/scripts/mkderivedvalues.pl +++ b/libical/scripts/mkderivedvalues.pl @@ -157,8 +157,10 @@ foreach $value (keys %h) { if ($type =~ /char/){ $assign = "icalmemory_strdup(v);\n\n if (impl->data.v_string == 0){\n errno = ENOMEM;\n }\n"; + $check_arg = "icalerror_check_arg_rz( (value!=0),\"value\");"; } else { $assign = "v;"; + $check_arg = "icalerror_check_arg( (value!=0),\"value\");"; } my $union_data; @@ -197,7 +199,7 @@ void icalvalue_set_${lc}(icalvalue* value, $type v) {\ print "\n impl->data.v_$union_data = $assign \n }\n"; print "$type\ icalvalue_get_${lc}(icalvalue* value)\ {\n\ - icalerror_check_arg( (value!=0),\"value\");\ + $check_arg\ icalerror_check_value_type(value, ICAL_${uc}_VALUE);\ return ((struct icalvalue_impl*)value)->data.v_${union_data};\n}\n"; -- cgit v1.2.3