activation: Fix parsing of description from buddyml response

alexR89 · Jan 27, 2019 · ff37642 · ff37642
1 parent a2dfb1b
commit ff37642
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/activation.c b/src/activation.c
@@ -314,11 +314,17 @@ static idevice_activation_error_t idevice_activation_parse_buddyml_response(idev
 		xmlXPathFreeObject(xpath_result);
 		xpath_result = NULL;
 	}
-	xpath_result = xmlXPathEvalExpression((const xmlChar*) "/xmlui/page/tableView/section[@footer and not(@footerLinkURL)]/@footer", context);
+	xpath_result = xmlXPathEvalExpression((const xmlChar*) "/xmlui/page/tableView/section/footer[not (@url)]", context);
 	if (!xpath_result) {
 		result = IDEVICE_ACTIVATION_E_INTERNAL_ERROR;
 		goto cleanup;
 	}
+	if (!xpath_result->nodesetval) {
+		xmlXPathFreeObject(xpath_result);
+		xpath_result = xmlXPathEvalExpression((const xmlChar*) "/xmlui/page/tableView/section[@footer and not(@footerLinkURL)]/@footer", context);
+		result = IDEVICE_ACTIVATION_E_INTERNAL_ERROR;
+		goto cleanup;
+	}
 
 	if (xpath_result->nodesetval) {
 		char* response_description = (char*) malloc(sizeof(char));
@@ -348,6 +354,7 @@ static idevice_activation_error_t idevice_activation_parse_buddyml_response(idev
 		xmlXPathFreeObject(xpath_result);
 		xpath_result = NULL;
 	}
+
 	xpath_result = xmlXPathEvalExpression((const xmlChar*) "/xmlui/page//editableTextRow", context);
 	if (!xpath_result) {
 		result = IDEVICE_ACTIVATION_E_INTERNAL_ERROR;