Re: [PATCH 2/5] simutil: SIM applications directory decoding utils.

[Denis Kenzior <denkenz@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 2221 bytes --]

Hi Andrew,

On 01/17/2011 11:38 AM, Andrzej Zaborowski wrote:
> ---
>  src/simutil.c |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  src/simutil.h |    2 ++
>  2 files changed, 59 insertions(+), 0 deletions(-)
> 
> diff --git a/src/simutil.c b/src/simutil.c
> index 8abf3d5..b3e2f52 100644
> --- a/src/simutil.c
> +++ b/src/simutil.c
> @@ -1465,3 +1465,60 @@ gboolean sim_sst_is_active(unsigned char *efsst, unsigned char len,
>  
>  	return (efsst[index / 4] >> (((index % 4) * 2) + 1)) & 1;
>  }
> +
> +GSList *sim_parse_app_template_entries(const unsigned char *buffer, int len)
> +{
> +	GSList *ret = NULL;
> +	const unsigned char *dataobj;
> +	int dataobj_len;
> +
> +	/* Find all the application entries */
> +	while ((dataobj = ber_tlv_find_by_tag(buffer, 0x61, len,
> +						&dataobj_len)) != NULL) {
> +		struct ofono_sim_app_record app;
> +		const unsigned char *aid, *label;
> +		int label_len;
> +
> +		/* Find the aid (mandatory) */
> +		aid = ber_tlv_find_by_tag(dataobj, 0x4f, dataobj_len,
> +						&app.aid_len);
> +		if (!aid || app.aid_len < 0x01 || app.aid_len > 0x10)
> +			goto error;
> +
> +		memcpy(app.aid, aid, app.aid_len);
> +
> +		/* Find the label (optional) */
> +		label = ber_tlv_find_by_tag(dataobj, 0x50, dataobj_len,
> +						&label_len);
> +		if (label) {
> +			/*
> +			 * Label field uses the extra complicated
> +			 * encoding in 102.221 Annex A
> +			 */
> +			app.label = sim_string_to_utf8(label, label_len);
> +
> +			if (app.label == NULL)
> +				goto error;
> +		} else
> +			app.label = NULL;
> +
> +		ret = g_slist_prepend(ret, g_memdup(&app, sizeof(app)));
> +
> +		len -= (dataobj - buffer) + dataobj_len;
> +		buffer = dataobj + dataobj_len;
> +	}
> +
> +	return ret;
> +
> +error:
> +	while (ret) {
> +		GSList *t = ret;
> +
> +		g_free(((struct ofono_sim_app_record *) ret->data)->label);

Is there a memory leak here?  I don't believe you are freeing the
ofono_sim_app_record structure itself.  This might be the opportunity to
get rid of that nasty cast as well ;)

> +
> +		ret = ret->next;
> +		g_slist_free_1(t);
> +	}
> +
> +	return NULL;
> +}

Regards,
-Denis