From 1b854e250e0dec1885bd7c7513069acb38d752f0 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Wed, 28 Nov 2018 17:09:17 +0000
Subject: [PATCH] Function for copying property lists.

---
 lib/mosquitto.h     |  15 +++++++
 lib/property_mosq.c | 107 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 122 insertions(+)

diff --git a/lib/mosquitto.h b/lib/mosquitto.h
index 46fe350e..e641a8d1 100644
--- a/lib/mosquitto.h
+++ b/lib/mosquitto.h
@@ -90,6 +90,7 @@ enum mosq_err_t {
 	MOSQ_ERR_LOOKUP = 20,
 	MOSQ_ERR_MALFORMED_PACKET = 19,
 	MOSQ_ERR_DUPLICATE_PROPERTY = 20,
+	MOSQ_ERR_TLS_HANDSHAKE = 21,
 };
 
 /* Error values */
@@ -2587,6 +2588,20 @@ libmosq_EXPORT int mosquitto_property_read_string_pair(const mosquitto_property
  */
 libmosq_EXPORT void mosquitto_property_free_all(mosquitto_property **properties);
 
+/*
+ * Function: mosquitto_property_copy_all
+ *
+ * Parameters:
+ *    dest : pointer for new property list
+ *    src : property list
+ *
+ * Returns:
+ *    MOSQ_ERR_SUCCESS - on successful copy
+ *    MOSQ_ERR_INVAL - if dest is NULL
+ *    MOSQ_ERR_NOMEM - on out of memory (dest will be set to NULL)
+ */
+libmosq_EXPORT int mosquitto_property_copy_all(mosquitto_property **dest, const mosquitto_property *src);
+
 /*
  * Function: mosquitto_property_check_command
  *
diff --git a/lib/property_mosq.c b/lib/property_mosq.c
index 46ab2d8a..40fc3909 100644
--- a/lib/property_mosq.c
+++ b/lib/property_mosq.c
@@ -1020,3 +1020,110 @@ int mosquitto_property_read_string_pair(const mosquitto_property *property, char
 
 	return MOSQ_ERR_SUCCESS;
 }
+
+
+int mosquitto_property_copy_all(mosquitto_property **dest, const mosquitto_property *src)
+{
+	mosquitto_property *pnew, *plast = NULL;
+
+	if(!src) return MOSQ_ERR_SUCCESS;
+	if(!dest) return MOSQ_ERR_INVAL;
+
+	*dest = NULL;
+
+	while(src){
+		pnew = calloc(1, sizeof(mosquitto_property));
+		if(!pnew){
+			mosquitto_property_free_all(dest);
+			return MOSQ_ERR_NOMEM;
+		}
+		if(plast){
+			plast->next = pnew;
+		}else{
+			*dest = pnew;
+		}
+		plast = pnew;
+
+		pnew->identifier = src->identifier;
+		switch(pnew->identifier){
+			case MQTT_PROP_PAYLOAD_FORMAT_INDICATOR:
+			case MQTT_PROP_REQUEST_PROBLEM_INFORMATION:
+			case MQTT_PROP_REQUEST_RESPONSE_INFORMATION:
+			case MQTT_PROP_MAXIMUM_QOS:
+			case MQTT_PROP_RETAIN_AVAILABLE:
+			case MQTT_PROP_WILDCARD_SUB_AVAILABLE:
+			case MQTT_PROP_SUBSCRIPTION_ID_AVAILABLE:
+			case MQTT_PROP_SHARED_SUB_AVAILABLE:
+				pnew->value.i8 = src->value.i8;
+				break;
+
+			case MQTT_PROP_SERVER_KEEP_ALIVE:
+			case MQTT_PROP_RECEIVE_MAXIMUM:
+			case MQTT_PROP_TOPIC_ALIAS_MAXIMUM:
+			case MQTT_PROP_TOPIC_ALIAS:
+				pnew->value.i16 = src->value.i16;
+				break;
+
+			case MQTT_PROP_MESSAGE_EXPIRY_INTERVAL:
+			case MQTT_PROP_SESSION_EXPIRY_INTERVAL:
+			case MQTT_PROP_WILL_DELAY_INTERVAL:
+			case MQTT_PROP_MAXIMUM_PACKET_SIZE:
+				pnew->value.i32 = src->value.i32;
+				break;
+
+			case MQTT_PROP_SUBSCRIPTION_IDENTIFIER:
+				pnew->value.varint = src->value.varint;
+				break;
+
+			case MQTT_PROP_CONTENT_TYPE:
+			case MQTT_PROP_RESPONSE_TOPIC:
+			case MQTT_PROP_ASSIGNED_CLIENT_IDENTIFIER:
+			case MQTT_PROP_AUTHENTICATION_METHOD:
+			case MQTT_PROP_RESPONSE_INFORMATION:
+			case MQTT_PROP_SERVER_REFERENCE:
+			case MQTT_PROP_REASON_STRING:
+				pnew->value.s.len = src->value.s.len;
+				pnew->value.s.v = strdup(src->value.s.v);
+				if(!pnew->value.s.v){
+					mosquitto_property_free_all(dest);
+					return MOSQ_ERR_NOMEM;
+				}
+				break;
+
+			case MQTT_PROP_AUTHENTICATION_DATA:
+			case MQTT_PROP_CORRELATION_DATA:
+				pnew->value.bin.len = src->value.bin.len;
+				pnew->value.bin.v = malloc(pnew->value.bin.len);
+				if(!pnew->value.bin.v){
+					mosquitto_property_free_all(dest);
+					return MOSQ_ERR_NOMEM;
+				}
+				memcpy(pnew->value.bin.v, src->value.bin.v, pnew->value.bin.len);
+				break;
+
+			case MQTT_PROP_USER_PROPERTY:
+				pnew->value.s.len = src->value.s.len;
+				pnew->value.s.v = strdup(src->value.s.v);
+				if(!pnew->value.s.v){
+					mosquitto_property_free_all(dest);
+					return MOSQ_ERR_NOMEM;
+				}
+
+				pnew->name.len = src->name.len;
+				pnew->name.v = strdup(src->name.v);
+				if(!pnew->name.v){
+					mosquitto_property_free_all(dest);
+					return MOSQ_ERR_NOMEM;
+				}
+				break;
+
+			default:
+				mosquitto_property_free_all(dest);
+				return MOSQ_ERR_INVAL;
+		}
+
+		src = src->next;
+	}
+
+	return MOSQ_ERR_SUCCESS;
+}