hci->device.inquiry_scan = 0;
hci->device.page_scan = 0;
if (hci->device.lmp_name)
- free((void *) hci->device.lmp_name);
+ qemu_free((void *) hci->device.lmp_name);
hci->device.lmp_name = 0;
hci->device.class[0] = 0x00;
hci->device.class[1] = 0x00;
LENGTH_CHECK(change_local_name);
if (hci->device.lmp_name)
- free((void *) hci->device.lmp_name);
- hci->device.lmp_name = strndup(PARAM(change_local_name, name),
+ qemu_free((void *) hci->device.lmp_name);
+ hci->device.lmp_name = qemu_strndup(PARAM(change_local_name, name),
sizeof(PARAM(change_local_name, name)));
bt_hci_event_complete_status(hci, HCI_SUCCESS);
break;
bt_device_done(&hci->device);
if (hci->device.lmp_name)
- free((void *) hci->device.lmp_name);
+ qemu_free((void *) hci->device.lmp_name);
/* Be gentle and send DISCONNECT to all connected peers and those
* currently waiting for us to accept or reject a connection request.
void *qemu_mallocz(size_t size);
void qemu_free(void *ptr);
char *qemu_strdup(const char *str);
+char *qemu_strndup(const char *str, size_t size);
void *get_mmap_addr(unsigned long size);
ptr = qemu_malloc(len + 1);
if (!ptr)
return NULL;
- pstrcpy(ptr, len + 1, str);
+ memcpy(ptr, str, len + 1);
return ptr;
}
+
+char *qemu_strndup(const char *str, size_t size)
+{
+ const char *end = memchr(str, 0, size);
+ char *new;
+
+ if (end)
+ size = end - str;
+
+ new = qemu_malloc(size + 1);
+ new[size] = 0;
+
+ return memcpy(new, str, size);
+}