From f6e041ea2d0b8584624171f2a4d48e9714754abc Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 8 Feb 2010 21:37:39 +0100 Subject: [PATCH 01/10] Fix pointless read of uninitiliazed variable. --- libxnee/src/xnee.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/libxnee/src/xnee.c b/libxnee/src/xnee.c index e5e161e..3c4ccb5 100644 --- a/libxnee/src/xnee.c +++ b/libxnee/src/xnee.c @@ -99,10 +99,6 @@ xnee_start(xnee_data *xd) handled by normal parsing ..... */ if (xnee_is_syntax_checker(xd)) { - if (ret == XNEE_OK) - { - ; - } return XNEE_OK; } -- 1.6.6.1 From e4a95ad47680337ebcb446a6c96eb5fe7747c510 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 8 Feb 2010 21:46:49 +0100 Subject: [PATCH 02/10] Fix NULL pointer dereference in xnee_free_recordext_setup(), assuming xd can actually be NULL and the check at the beginning is necessary. While at it, move some XNEE_FOO lines into the if block. --- libxnee/src/xnee_alloc.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libxnee/src/xnee_alloc.c b/libxnee/src/xnee_alloc.c index d2ab519..2918437 100644 --- a/libxnee/src/xnee_alloc.c +++ b/libxnee/src/xnee_alloc.c @@ -140,16 +140,11 @@ xnee_free_recordext_setup(xnee_data* xd) } } XNEE_FREE_AND_NULL (record_setup->range_array); - } - + XNEE_FREE_IF_NOT_NULL (record_setup->xids); + XNEE_FREE_IF_NOT_NULL (record_setup->rState); - /*@ignore@*/ - if (record_setup!=NULL) - { - XNEE_FREE_IF_NOT_NULL (record_setup->xids); - XNEE_FREE_IF_NOT_NULL (record_setup->rState); + XNEE_FREE_IF_NOT_NULL (xd->record_setup); } - XNEE_FREE_IF_NOT_NULL (xd->record_setup); XNEE_DEBUG ( (stderr ," <--xnee_free_recordext_setup\n" )); return XNEE_OK; -- 1.6.6.1 From ef7ba4568a593bb0c1d0e879df5cd9035c15d486 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 8 Feb 2010 21:51:26 +0100 Subject: [PATCH 03/10] In xnee_record_async(), remove code that looks like copy&pasted twice. --- libxnee/src/xnee_record.c | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/libxnee/src/xnee_record.c b/libxnee/src/xnee_record.c index aeb32e4..dc83ec7 100644 --- a/libxnee/src/xnee_record.c +++ b/libxnee/src/xnee_record.c @@ -1149,28 +1149,6 @@ xnee_record_async(xnee_data *xd) context_display = xd->control ; } - - - if ( xnee_record_from_data_display(xd)) - { - /* - * From X.org 1.6.0 to ???? - * - * there seem to be something strange about - * the XRecordCreateContext call - * which causes the XRecordEnableContextAsync - * to fail ... ugly fix, but it works - * - */ - fprintf(stderr, "Workaround: Creating context on data display instead of control \n"); - fprintf(stderr, " You can ignore this message\n"); - context_display = xd->data ; - } - else - { - context_display = xd->control ; - } - xnee_verbose((xd, " --- xnee_record_async() enable context\n")); ret = XRecordEnableContextAsync(context_display, -- 1.6.6.1 From 2344f16530d687bcdaae95ea9ae0be674a07c787 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 8 Feb 2010 21:55:08 +0100 Subject: [PATCH 04/10] Fix ineffective NULL pointer check in xnee_set_project_file(). --- libxnee/src/xnee_setget.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libxnee/src/xnee_setget.c b/libxnee/src/xnee_setget.c index 76e1ec3..fe4a098 100755 --- a/libxnee/src/xnee_setget.c +++ b/libxnee/src/xnee_setget.c @@ -1214,7 +1214,7 @@ xnee_set_project_file(xnee_data *xd, char *name) if (name == NULL) { - ret = XNEE_WRONG_PARAMS; + return XNEE_WRONG_PARAMS; } ret = xnee_set_rc_byname (xd, name); -- 1.6.6.1 From 2cd691c7b9558853df1f88f7f5850027ab48192f Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 8 Feb 2010 22:12:17 +0100 Subject: [PATCH 05/10] This is a guess, but it looks like len is entirely useless in xnee_parse_range() and what's meant is range_len. --- libxnee/src/xnee_range.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libxnee/src/xnee_range.c b/libxnee/src/xnee_range.c index 7f53431..339981b 100755 --- a/libxnee/src/xnee_range.c +++ b/libxnee/src/xnee_range.c @@ -630,9 +630,8 @@ xnee_parse_range (xnee_data *xd,int type, char *range) { char buf[DATA_NAME_SIZE_MAX]; int next; - int len; int ret=0; - int range_len=strlen(range); + int range_len; /* */ @@ -650,7 +649,7 @@ xnee_parse_range (xnee_data *xd,int type, char *range) } strncpy(buf,range,next); buf[next]='\0'; - len =strlen(range); + range_len=strlen(range); range+=next+1; range_len=range_len - next - 1; xnee_verbose((xd, " -- calling xnee_add_range_str (%d, %d, %s) \n" , (int)xd, type, buf)); -- 1.6.6.1 From 77fe6827c2602a4f21275ade41fe716ac9a1e4b7 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 8 Feb 2010 22:14:37 +0100 Subject: [PATCH 06/10] Remove pointless store in xnee_human_print_event(). --- libxnee/src/print.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/libxnee/src/print.c b/libxnee/src/print.c index 295fc7f..e6889f9 100644 --- a/libxnee/src/print.c +++ b/libxnee/src/print.c @@ -333,7 +333,6 @@ xnee_human_print_event (xnee_data *xd, XRecordInterceptData *xrecintd ) char *name=" not defined " ; xrec_data = (XRecordDatum *) (xrecintd->data) ; event_type = (int)xrec_data->type ; - event_name = " not defined " ; event_name = xnee_print_event(event_type); if ( event_name == NULL ) -- 1.6.6.1 From 166df31ab41b518b6dcd7d3bf678ffc1f849a314 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 8 Feb 2010 22:17:50 +0100 Subject: [PATCH 07/10] Remove pointless store in xnee_human_print_request(). --- libxnee/src/print.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/libxnee/src/print.c b/libxnee/src/print.c index e6889f9..c5e73ba 100644 --- a/libxnee/src/print.c +++ b/libxnee/src/print.c @@ -233,7 +233,6 @@ xnee_human_print_request (xnee_data *xd, XRecordInterceptData *xrecintd ) xrec_data = (XRecordDatum *) (xrecintd->data) ; request_type = (int)xrec_data->type ; - request_name = " not defined " ; request_name = xnee_print_request(request_type); if ( request_name == NULL ) -- 1.6.6.1 From b39c4d977e57a2dbf705bb695af38626d13e5902 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Tue, 9 Feb 2010 13:59:13 +0100 Subject: [PATCH 08/10] In xnee_rep_prepare(), don't ignore xnee_replay_main_loop()'s return code. --- libxnee/src/xnee_session.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libxnee/src/xnee_session.c b/libxnee/src/xnee_session.c index 6c481d2..a025fdf 100644 --- a/libxnee/src/xnee_session.c +++ b/libxnee/src/xnee_session.c @@ -521,6 +521,7 @@ xnee_rep_prepare(xnee_data *xd) { xnee_verbose((xd, "Entering main loop (replayer) to read META data \n")); ret = xnee_replay_main_loop(xd, XNEE_REPLAY_READ_META_DATA); + XNEE_RETURN_IF_ERR (ret); } /* -- 1.6.6.1 From 81a4b87d61a7a6c09d274ce23f1cdc01245fd6e8 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Tue, 9 Feb 2010 14:01:40 +0100 Subject: [PATCH 09/10] xnee_expression_handle_comment() doesn't seem to do anything with tmp's length, so don't bother getting it. --- libxnee/src/xnee_expr.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/libxnee/src/xnee_expr.c b/libxnee/src/xnee_expr.c index 333c6a8..88e5d47 100644 --- a/libxnee/src/xnee_expr.c +++ b/libxnee/src/xnee_expr.c @@ -333,10 +333,6 @@ xnee_expression_handle_settings(xnee_data *xd, char *tmp, int synt_mode) static int xnee_expression_handle_comment(xnee_data *xd, char *tmp) { - int len ; - - len = strlen(tmp); - xnee_verbose ((xd, "handling comment: \"%s\"\n", tmp)); if (!strncmp("#",tmp,1)) /* # META data */ { -- 1.6.6.1 From a7e6f17147cac78126aaee0978f46ac9f1698711 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Tue, 9 Feb 2010 14:20:15 +0100 Subject: [PATCH 10/10] Remove two lines in xnee_expression_handle_prim_sub() that seem to have no effect. --- libxnee/src/xnee_expr.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/libxnee/src/xnee_expr.c b/libxnee/src/xnee_expr.c index 88e5d47..80b7129 100644 --- a/libxnee/src/xnee_expr.c +++ b/libxnee/src/xnee_expr.c @@ -642,9 +642,6 @@ xnee_expression_handle_prim_sub(xnee_data *xd, char *arg, xnee_script_s *xss) { if (strlen(val)==1) { - valp = &val[0]; - valp++; - if (val[0]=='\0') { val[0]=' '; -- 1.6.6.1