libtransport.git Changeset - da9138fe29ae

Changeset - da9138fe29ae

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Vitaly Takmazov - 10 years ago 2015-12-14 22:14:48
vitalyster@gmail.com

fix crash in form processing

1 file changed with 4 insertions and 2 deletions:

spectrum/src/frontends/xmpp/formutils.cpp

0 comments (0 inline, 0 general)

spectrum/src/frontends/xmpp/formutils.cpp

➞

Show inline comments

 	form->addField(createTextFixedField(value));
+}
 std::string fieldValue(Swift::FormField::ref field) {
 #if HAVE_SWIFTEN_3
 	return field->getValues()[0];
 	const std::vector<std::string> values = field->getValues();
 	return values.empty() ? "" : values[0];
 #else
 	TextSingleFormField::ref textSingle = boost::dynamic_pointer_cast<TextSingleFormField>(field);
 	if (textSingle) {
 		return textSingle->getValue();
+	}
@@ @@ -196,14 +197,15 @@ std::string fieldValue(Swift::FormField::ref field) { @@
 std::string fieldValue(Swift::Form::ref form, const std::string &key, const std::string &def) {
 	const std::vector<FormField::ref> fields = form->getFields();
 	for (std::vector<FormField::ref>::const_iterator it = fields.begin(); it != fields.end(); it++) {
 #if HAVE_SWIFTEN_3
 		FormField::ref field = *it;
 		const std::vector<std::string> values = field->getValues();
 		if (field->getName() == key) {
-			return field->getValues()[0];
+			return values.empty() ? "" : values[0];
+		}
 #else
 		TextSingleFormField::ref textSingle = boost::dynamic_pointer_cast<TextSingleFormField>(*it);
 		if (textSingle && textSingle->getName() == key) {
 			return textSingle->getValue();
+		}

0 comments (0 inline, 0 general)