|
@@ -481,14 +481,14 @@ my_ber_scanf_value(BerElement *ber, Slapi_Value **value, PRBool *deleted)
|
|
|
|
|
|
|
|
PR_ASSERT(ber && value && deleted);
|
|
PR_ASSERT(ber && value && deleted);
|
|
|
|
|
|
|
|
- *value = NULL;
|
|
|
|
|
-
|
|
|
|
|
if (NULL == ber && NULL == value)
|
|
if (NULL == ber && NULL == value)
|
|
|
{
|
|
{
|
|
|
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "my_ber_scanf_value BAD 1\n");
|
|
slapi_log_error(SLAPI_LOG_FATAL, repl_plugin_name, "my_ber_scanf_value BAD 1\n");
|
|
|
goto loser;
|
|
goto loser;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ *value = NULL;
|
|
|
|
|
+
|
|
|
/* Each value is a sequence */
|
|
/* Each value is a sequence */
|
|
|
if (ber_scanf(ber, "{O", &attrval) == LBER_ERROR)
|
|
if (ber_scanf(ber, "{O", &attrval) == LBER_ERROR)
|
|
|
{
|
|
{
|
|
@@ -593,11 +593,16 @@ my_ber_scanf_attr (BerElement *ber, Slapi_Attr **attr, PRBool *deleted)
|
|
|
int rc;
|
|
int rc;
|
|
|
Slapi_Value *value = NULL;
|
|
Slapi_Value *value = NULL;
|
|
|
|
|
|
|
|
|
|
+ if (attr == NULL)
|
|
|
|
|
+ {
|
|
|
|
|
+ goto loser;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
PR_ASSERT (ber && attr && deleted);
|
|
PR_ASSERT (ber && attr && deleted);
|
|
|
|
|
|
|
|
/* allocate the attribute */
|
|
/* allocate the attribute */
|
|
|
*attr = slapi_attr_new ();
|
|
*attr = slapi_attr_new ();
|
|
|
- if (attr == NULL)
|
|
|
|
|
|
|
+ if (*attr == NULL)
|
|
|
{
|
|
{
|
|
|
goto loser;
|
|
goto loser;
|
|
|
}
|
|
}
|