Handle NULL return from os_zalloc() in sta_track_add()

[mech_eap.git] / src / wps / wps_dev_attr.c

diff --git a/src/wps/wps_dev_attr.c b/src/wps/wps_dev_attr.c
index 1b12b5a..0d01211 100644 (file)
--- a/src/wps/wps_dev_attr.c
+++ b/src/wps/wps_dev_attr.c
@@ -85,8 +85,7 @@ int wps_build_model_number(struct wps_device_data *dev, struct wpabuf *msg)
 }
 
 
-static int wps_build_serial_number(struct wps_device_data *dev,
-                                  struct wpabuf *msg)
+int wps_build_serial_number(struct wps_device_data *dev, struct wpabuf *msg)
 {
        size_t len;
        wpa_printf(MSG_DEBUG, "WPS:  * Serial Number");
@@ -220,11 +219,7 @@ int wps_build_vendor_ext_m1(struct wps_device_data *dev, struct wpabuf *msg)
 int wps_build_rf_bands(struct wps_device_data *dev, struct wpabuf *msg,
                       u8 rf_band)
 {
-       wpa_printf(MSG_DEBUG, "WPS:  * RF Bands (%x)", dev->rf_bands);
-       wpabuf_put_be16(msg, ATTR_RF_BANDS);
-       wpabuf_put_be16(msg, 1);
-       wpabuf_put_u8(msg, rf_band ? rf_band : dev->rf_bands);
-       return 0;
+       return wps_build_rf_bands_attr(msg, rf_band ? rf_band : dev->rf_bands);
 }
 
 
@@ -409,25 +404,6 @@ int wps_process_rf_bands(struct wps_device_data *dev, const u8 *bands)
 }
 
 
-void wps_device_data_dup(struct wps_device_data *dst,
-                        const struct wps_device_data *src)
-{
-       if (src->device_name)
-               dst->device_name = os_strdup(src->device_name);
-       if (src->manufacturer)
-               dst->manufacturer = os_strdup(src->manufacturer);
-       if (src->model_name)
-               dst->model_name = os_strdup(src->model_name);
-       if (src->model_number)
-               dst->model_number = os_strdup(src->model_number);
-       if (src->serial_number)
-               dst->serial_number = os_strdup(src->serial_number);
-       os_memcpy(dst->pri_dev_type, src->pri_dev_type, WPS_DEV_TYPE_LEN);
-       dst->os_version = src->os_version;
-       dst->rf_bands = src->rf_bands;
-}
-
-
 void wps_device_data_free(struct wps_device_data *dev)
 {
        os_free(dev->device_name);