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/common/scpi-def.h | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/examples/common/scpi-def.h b/examples/common/scpi-def.h index 646a653..f451300 100644 --- a/examples/common/scpi-def.h +++ b/examples/common/scpi-def.h @@ -3,16 +3,27 @@ #include "scpi/scpi.h" +#define SCPI_INPUT_BUFFER_LENGTH 256 +#define SCPI_ERROR_QUEUE_SIZE 17 +#define SCPI_IDN1 "MANUFACTURE" +#define SCPI_IDN2 "INSTR2013" +#define SCPI_IDN3 NULL +#define SCPI_IDN4 "01-02" + +extern const scpi_command_t scpi_commands[]; +extern scpi_interface_t scpi_interface; +extern char scpi_input_buffer[]; +extern scpi_error_t scpi_error_queue_data[]; extern scpi_t scpi_context; size_t SCPI_Write(scpi_t * context, const char * data, size_t len); int SCPI_Error(scpi_t * context, int_fast16_t err); -scpi_result_t SCPI_Srq(scpi_t * context); +scpi_result_t SCPI_Control(scpi_t * context, scpi_ctrl_name_t ctrl, scpi_reg_val_t val); scpi_result_t SCPI_Reset(scpi_t * context); -scpi_result_t SCPI_Test(scpi_t * context); +scpi_result_t SCPI_Flush(scpi_t * context); - +scpi_result_t SCPI_SystemCommTcpipControlQ(scpi_t * context); #endif // __SCPI_DEF_H_ -- Gitblit v1.9.1