From 3344d1a728d37f0fb3e82a6a945eee0c780eb734 Mon Sep 17 00:00:00 2001
From: Chernov Dmitriy <cd_work@mail.ru>
Date: 周三, 02 3月 2016 21:29:32 +0800
Subject: [PATCH] Fix potential memory leak. #73
---
libscpi/src/error.c | 87 ++++++++++++++++++++++++++++---------------
1 files changed, 57 insertions(+), 30 deletions(-)
diff --git a/libscpi/src/error.c b/libscpi/src/error.c
index 9d8e756..d1307a4 100644
--- a/libscpi/src/error.c
+++ b/libscpi/src/error.c
@@ -45,7 +45,7 @@
* Initialize error queue
* @param context - scpi context
*/
-void SCPI_ErrorInit(scpi_t * context, int16_t * data, int16_t size) {
+void SCPI_ErrorInit(scpi_t * context, scpi_error_t * data, int16_t size) {
fifo_init(&context->error_queue, data, size);
}
@@ -81,6 +81,12 @@
* @param context - scpi context
*/
void SCPI_ErrorClear(scpi_t * context) {
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+ scpi_error_t error;
+ while(fifo_remove(&context->error_queue, &error)){
+ SCPIDEFINE_free(&context->error_info_heap, error.device_dependent_info, false);
+ }
+#endif
fifo_clear(&context->error_queue);
SCPI_ErrorEmitEmpty(context);
@@ -89,16 +95,18 @@
/**
* Pop error from queue
* @param context - scpi context
- * @return error number
+ * @param error
+ * @return
*/
-int16_t SCPI_ErrorPop(scpi_t * context) {
- int16_t result = 0;
+scpi_bool_t SCPI_ErrorPop(scpi_t * context, scpi_error_t * error) {
+ if(!error || !context) return FALSE;
+ error->error_code = 0;
+ error->device_dependent_info = NULL;
+ fifo_remove(&context->error_queue, error);
- fifo_remove(&context->error_queue, &result);
+ SCPI_ErrorEmitEmpty(context);
- SCPI_ErrorEmitEmpty(context);
-
- return result;
+ return TRUE;
}
/**
@@ -114,10 +122,10 @@
return result;
}
-static scpi_bool_t SCPI_ErrorAddInternal(scpi_t * context, int16_t err) {
- if (!fifo_add(&context->error_queue, err)) {
+static scpi_bool_t SCPI_ErrorAddInternal(scpi_t * context, int16_t err, char * info) {
+ if (!fifo_add(&context->error_queue, err, info)) {
fifo_remove_last(&context->error_queue, NULL);
- fifo_add(&context->error_queue, SCPI_ERROR_QUEUE_OVERFLOW);
+ fifo_add(&context->error_queue, SCPI_ERROR_QUEUE_OVERFLOW, NULL);
return FALSE;
}
return TRUE;
@@ -148,26 +156,45 @@
* @param context - scpi context
* @param err - error number
*/
+void SCPI_ErrorPushEx(scpi_t * context, int16_t err, char * info) {
+ int i;
+ char * info_ptr = NULL;
+
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+ if (info){
+ info_ptr = SCPIDEFINE_strdup(&context->error_info_heap, info);
+ }
+#endif
+
+ scpi_bool_t queue_overflow = !SCPI_ErrorAddInternal(context, err, info_ptr);
+
+ for (i = 0; i < ERROR_DEFS_N; i++) {
+ if ((err <= errs[i].from) && (err >= errs[i].to)) {
+ SCPI_RegSetBits(context, SCPI_REG_ESR, errs[i].bit);
+ }
+ }
+
+ SCPI_ErrorEmit(context, err);
+ if (queue_overflow) {
+ SCPI_ErrorEmit(context, SCPI_ERROR_QUEUE_OVERFLOW);
+#if USE_DEVICE_DEPENDENT_ERROR_INFORMATION
+ SCPIDEFINE_free(&context->error_info_heap, info_ptr, true);
+#endif
+ }
+
+ if (context) {
+ context->cmd_error = TRUE;
+ }
+}
+
+/**
+ * Push error to queue
+ * @param context - scpi context
+ * @param err - error number
+ */
void SCPI_ErrorPush(scpi_t * context, int16_t err) {
-
- int i;
-
- scpi_bool_t queue_overflow = !SCPI_ErrorAddInternal(context, err);
-
- for (i = 0; i < ERROR_DEFS_N; i++) {
- if ((err <= errs[i].from) && (err >= errs[i].to)) {
- SCPI_RegSetBits(context, SCPI_REG_ESR, errs[i].bit);
- }
- }
-
- SCPI_ErrorEmit(context, err);
- if (queue_overflow) {
- SCPI_ErrorEmit(context, SCPI_ERROR_QUEUE_OVERFLOW);
- }
-
- if (context) {
- context->cmd_error = TRUE;
- }
+ SCPI_ErrorPushEx(context, err, NULL);
+ return;
}
/**
--
Gitblit v1.9.1