}
}
-static int decode_xfer_read(char const *_buf, char **annex, int *ofs, unsigned int *len)
+static int decode_xfer_read(char const *buf, char **annex, int *ofs, unsigned int *len)
{
- int ret = 0;
- char *buf = strdup(_buf);
- char *_annex;
- char *separator;
-
- /* Extract and NUL-terminate the annex. */
- _annex = buf;
- while (*buf && *buf != ':')
- buf++;
- if (*buf == '\0') {
- ret = -1;
- goto out;
- }
- *buf++ = 0;
-
- /* Return annex as copy because "buf" will be freed in this function */
- *annex = strdup(_annex);
+ /* Locate the annex. */
+ const char *annex_end = strchr(buf, ':');
+ if (annex_end == NULL)
+ return ERROR_FAIL;
/* After the read marker and annex, qXfer looks like a
* traditional 'm' packet. */
+ char *separator;
+ *ofs = strtoul(annex_end + 1, &separator, 16);
- *ofs = strtoul(buf, &separator, 16);
-
- if (*separator != ',') {
- ret = -1;
- goto out;
- }
+ if (*separator != ',')
+ return ERROR_FAIL;
*len = strtoul(separator + 1, NULL, 16);
-out:
- free(buf);
- return ret;
+ /* Extract the annex if needed */
+ if (annex != NULL) {
+ *annex = strndup(buf, annex_end - buf);
+ if (*annex == NULL)
+ return ERROR_FAIL;
+ }
+
+ return ERROR_OK;
}
static int compare_bank(const void *a, const void *b)
/* Get a list of available target registers features. feature_list must
* be freed by caller.
*/
-static int get_reg_features_list(struct target *target, char **feature_list[], int *feature_list_size,
+static int get_reg_features_list(struct target *target, char const **feature_list[], int *feature_list_size,
struct reg **reg_list, int reg_list_size)
{
int tbl_sz = 0;
*/
for (int j = 0; j < (tbl_sz + 1); j++) {
if (!((*feature_list)[j])) {
- (*feature_list)[tbl_sz++] = strdup(reg_list[i]->feature->name);
+ (*feature_list)[tbl_sz++] = reg_list[i]->feature->name;
*feature_list = realloc(*feature_list, sizeof(char *) * (tbl_sz + 1));
(*feature_list)[tbl_sz] = NULL;
break;
int retval = ERROR_OK;
struct reg **reg_list = NULL;
int reg_list_size;
- char **features = NULL;
+ char const **features = NULL;
int feature_list_size = 0;
char *tdesc = NULL;
int pos = 0;
"</target>\n");
error:
-
- /* note: features[] contains (feature_list_size + 1) elements */
- for (int j = feature_list_size; j >= 0; j--)
- free(features[j]);
free(features);
free(reg_list);
int retval = ERROR_OK;
struct reg **reg_list = NULL;
int reg_list_size = 0;
- char **features = NULL;
+ char const **features = NULL;
int feature_list_size = 0;
retval = target_get_gdb_reg_list(target, ®_list,
}
error:
-
- /* note: features[] contains (feature_list_size + 1) elements */
- for (int j = feature_list_size; j >= 0; j--)
- free(features[j]);
free(features);
free(reg_list);
int offset;
unsigned int length;
- char *annex = NULL;
/* skip command character */
packet += 20;
- if (decode_xfer_read(packet, &annex, &offset, &length) < 0) {
+ if (decode_xfer_read(packet, NULL, &offset, &length) < 0) {
gdb_send_error(connection, 01);
return ERROR_OK;
}
- free(annex);
/* Target should prepare correct target description for annex.
* The first character of returned xml is 'm' or 'l'. 'm' for