summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Laniel <dlaniel@entrouvert.com>2008-05-20 10:38:12 +0000
committerDamien Laniel <dlaniel@entrouvert.com>2008-05-20 10:38:12 +0000
commit975cff404d2b398fb148eb5458843c7483400bb0 (patch)
tree0f6d7307b5762e231799fe918050a06318aa6bb9
parent5711105dfb5bcaa9b09c19102c96811437bc6c08 (diff)
stronger check on empty string parameters
-rw-r--r--lasso/id-wsf-2.0/discovery.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/lasso/id-wsf-2.0/discovery.c b/lasso/id-wsf-2.0/discovery.c
index d6552541..bf389847 100644
--- a/lasso/id-wsf-2.0/discovery.c
+++ b/lasso/id-wsf-2.0/discovery.c
@@ -97,9 +97,9 @@ lasso_idwsf2_discovery_metadata_register_self(LassoIdWsf2Discovery *discovery,
char unique_id[33];
g_return_val_if_fail(LASSO_IS_IDWSF2_DISCOVERY(discovery), NULL);
- g_return_val_if_fail(service_type != NULL, NULL);
- g_return_val_if_fail(abstract != NULL, NULL);
- g_return_val_if_fail(soap_endpoint != NULL, NULL);
+ g_return_val_if_fail(service_type != NULL && strcmp(service_type, "") != 0, NULL);
+ g_return_val_if_fail(abstract != NULL && strcmp(abstract, "") != 0, NULL);
+ g_return_val_if_fail(soap_endpoint != NULL && strcmp(soap_endpoint, "") != 0, NULL);
provider = LASSO_PROVIDER(LASSO_PROFILE(profile)->server);
provider_id = provider->ProviderID;
@@ -134,10 +134,14 @@ lasso_idwsf2_discovery_init_metadata_register(LassoIdWsf2Discovery *discovery,
g_return_val_if_fail(LASSO_IS_IDWSF2_DISCOVERY(discovery),
LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
- g_return_val_if_fail(service_type != NULL, LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
- g_return_val_if_fail(abstract != NULL, LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
- g_return_val_if_fail(disco_provider_id != NULL, LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
- g_return_val_if_fail(soap_endpoint != NULL, LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
+ g_return_val_if_fail(service_type != NULL && strcmp(service_type, "") != 0,
+ LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
+ g_return_val_if_fail(abstract != NULL && strcmp(abstract, "") != 0,
+ LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
+ g_return_val_if_fail(disco_provider_id != NULL && strcmp(disco_provider_id, "") != 0,
+ LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
+ g_return_val_if_fail(soap_endpoint != NULL && strcmp(soap_endpoint, "") != 0,
+ LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
/* Get the providerId of this SP */
provider = LASSO_PROVIDER(LASSO_PROFILE(profile)->server);