From 871b3cb04aaa24637a3b2bfae7082dfacf34f7d2 Mon Sep 17 00:00:00 2001 From: Christopher Peplin Date: Mon, 6 Jan 2014 23:48:50 -0500 Subject: [PATCH] Grab PID from response without dereffing a type punned pointer. --- deps/isotp-c | 2 +- src/obd2/obd2.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/deps/isotp-c b/deps/isotp-c index 8922abb7..513d8c8d 160000 --- a/deps/isotp-c +++ b/deps/isotp-c @@ -1 +1 @@ -Subproject commit 8922abb7ff8c30e1fa5af078284eb6aebf0052e5 +Subproject commit 513d8c8d7089960618a1fa00a71442dc39294588 diff --git a/src/obd2/obd2.c b/src/obd2/obd2.c index c780fd8c..93cb8883 100644 --- a/src/obd2/obd2.c +++ b/src/obd2/obd2.c @@ -140,10 +140,8 @@ static bool handle_positive_response(DiagnosticRequestHandle* handle, response->mode = handle->request.mode; if(handle->request.pid_length > 0 && message->size > 1) { if(handle->request.pid_length == 2) { - response->pid = *(uint16_t*)&message->payload[PID_BYTE_INDEX]; - if(BYTE_ORDER == LITTLE_ENDIAN) { - response->pid = __builtin_bswap32(response->pid << 16); - } + response->pid = get_bitfield(message->payload, message->size, + PID_BYTE_INDEX * CHAR_BIT, sizeof(uint16_t) * CHAR_BIT); } else { response->pid = message->payload[PID_BYTE_INDEX]; } -- 2.16.6