Merge "DO NOT MERGE Fix unexpected behavior in SDP" into nyc-dev (fd73e115) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/sdp/sdp_server.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,8 @@
		*
		******************************************************************************/

		#include <cutils/log.h>

		#include <stdlib.h>
		#include <string.h>
		#include <stdio.h>
		@@ -360,6 +362,12 @@ static void process_service_attr_req (tCONN_CB *p_ccb, UINT16 trans_num,
		return;
		}

		if (max_list_len < 4) {
		sdpu_build_n_send_error(p_ccb, trans_num, SDP_ILLEGAL_PARAMETER, NULL);
		android_errorWriteLog(0x534e4554, "68776054");
		return;
		}

		/* Free and reallocate buffer */
		osi_free(p_ccb->rsp_list);
		p_ccb->rsp_list = (UINT8 *)osi_malloc(max_list_len);
		@@ -584,6 +592,12 @@ static void process_service_search_attr_req (tCONN_CB *p_ccb, UINT16 trans_num,

		memcpy(&attr_seq_sav, &attr_seq, sizeof(tSDP_ATTR_SEQ)) ;

		if (max_list_len < 4) {
		sdpu_build_n_send_error(p_ccb, trans_num, SDP_ILLEGAL_PARAMETER, NULL);
		android_errorWriteLog(0x534e4554, "68817966");
		return;
		}

		/* Free and reallocate buffer */
		osi_free(p_ccb->rsp_list);
		p_ccb->rsp_list = (UINT8 *)osi_malloc(max_list_len);