changeset 300:e76031031542

Fix error in dictionary search AVP
author Sebastien Decugis <sdecugis@nict.go.jp>
date Thu, 08 Jan 2009 13:29:13 +0900
parents 4e3ad81a06df
children a10a3403e8bd
files waaad/dictionary.c
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/waaad/dictionary.c	Wed Jan 07 15:05:24 2009 +0900
+++ b/waaad/dictionary.c	Thu Jan 08 13:29:13 2009 +0900
@@ -986,8 +986,14 @@
 				CHECK_PARAMS( (criteria != AVP_BY_NAME_AND_VENDOR) || _what->avp_name  );
 				
 				/* Now look for the vendor first */
-				CHECK_FCT_DO(  search_vendor( VENDOR_BY_ID_REF, &_what->avp_vendor, &vendor ),
-						CHECK_PARAMS( vendor = NULL ) );
+				CHECK_FCT( search_vendor( VENDOR_BY_ID_REF, &_what->avp_vendor, &vendor ) );
+				if (vendor == NULL) {
+					if (result)
+						*result = NULL;
+					else
+						ret = ENOENT;
+					goto end;
+				}
 				
 				/* We now have our vendor = head of the appropriate avp list */
 				if (criteria == AVP_BY_NAME_AND_VENDOR) {
"Welcome to our mercurial repository"