From 91dfcd5a5d2cb20285504d787ee4a6135303891a Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 15 5月 2016 20:01:44 +0800
Subject: [PATCH] Fix buffer overflow in SCPI_NumberToStr, SCPI_DoubleToStr and SCPI_FloatToStr
---
examples/test-tcp/main.c | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/examples/test-tcp/main.c b/examples/test-tcp/main.c
index 594b682..f1971c2 100644
--- a/examples/test-tcp/main.c
+++ b/examples/test-tcp/main.c
@@ -2,7 +2,7 @@
* Copyright (c) 2012-2013 Jan Breuer,
*
* All Rights Reserved
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
@@ -11,7 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -28,10 +28,10 @@
/**
* @file main.c
* @date Thu Nov 15 10:58:45 UTC 2012
- *
+ *
* @brief TCP/IP SCPI Server
- *
- *
+ *
+ *
*/
#include <stdio.h>
@@ -50,6 +50,8 @@
#include "../common/scpi-def.h"
size_t SCPI_Write(scpi_t * context, const char * data, size_t len) {
+ (void) context;
+
if (context->user_context != NULL) {
int fd = *(int *) (context->user_context);
return write(fd, data, len);
@@ -58,6 +60,8 @@
}
scpi_result_t SCPI_Flush(scpi_t * context) {
+ (void) context;
+
return SCPI_RES_OK;
}
@@ -69,6 +73,8 @@
}
scpi_result_t SCPI_Control(scpi_t * context, scpi_ctrl_name_t ctrl, scpi_reg_val_t val) {
+ (void) context;
+
if (SCPI_CTRL_SRQ == ctrl) {
fprintf(stderr, "**SRQ: 0x%X (%d)\r\n", val, val);
} else {
@@ -78,11 +84,15 @@
}
scpi_result_t SCPI_Reset(scpi_t * context) {
+ (void) context;
+
fprintf(stderr, "**Reset\r\n");
return SCPI_RES_OK;
}
scpi_result_t SCPI_SystemCommTcpipControlQ(scpi_t * context) {
+ (void) context;
+
return SCPI_RES_ERR;
}
@@ -159,7 +169,7 @@
}
/*
- *
+ *
*/
int main(int argc, char** argv) {
(void) argc;
@@ -172,7 +182,13 @@
// user_context will be pointer to socket
scpi_context.user_context = NULL;
- SCPI_Init(&scpi_context);
+ SCPI_Init(&scpi_context,
+ scpi_commands,
+ &scpi_interface,
+ scpi_units_def,
+ SCPI_IDN1, SCPI_IDN2, SCPI_IDN3, SCPI_IDN4,
+ scpi_input_buffer, SCPI_INPUT_BUFFER_LENGTH,
+ scpi_error_queue_data, SCPI_ERROR_QUEUE_SIZE);
listenfd = createServer(5025);
--
Gitblit v1.9.1