Attachment #332862 for bug #427030




#define False 0


void zerob(void* addr,size_t n) {
  memset(addr,0,n);
}


// calls to DB->err and DBENV->err lead to exceptions.

// FIX: currently, prefix is ignored.  Should be concatenated.
void raise_db_cb(const DB_ENV *dbenv, const char *prefix, const char *msg) {
    raise_db(msg);
}



  test_db_closed(db);

  zerob(&dbt,sizeof(DBT));

  dbt.data = String_val(key);
  dbt.size = string_length(key);


  test_db_closed(db);
  
  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));

  key.data = String_val(vkey);
  key.size = string_length(vkey);


  test_db_closed(db);

  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));

  key.data = String_val(vkey);
  key.size = string_length(vkey);

  
  test_cursor_closed(cursor);

  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));

  data.data = String_val(vdata);
  data.size = string_length(vdata);

  
  test_cursor_closed(cursor);

  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));

  key.data = String_val(vkey);
  key.size = string_length(vkey);


  test_cursor_closed(cursor);

  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));

  key.data = String_val(vkey);
  key.size = string_length(vkey);

  int flags = convert_flag_list(vflags,cursor_get_flags) | DB_SET_RANGE;
  int err;

  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));

  test_cursor_closed(cursor);


   flags = convert_flag_list(vflags,cursor_get_flags) | DB_GET_BOTH;
   test_cursor_closed(cursor);

   zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));

   key.data = String_val(vkey);
   key.size = string_length(vkey);

  int flags = Flag_val(vtype,cursor_get_type) | 
    convert_flag_list(vflags,cursor_get_flags);
  int err;
  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));

  test_cursor_closed(cursor);


  int flags = Flag_val(vtype,cursor_get_type) | 
    convert_flag_list(vflags,cursor_get_flags);
  int err;
  zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));

  test_cursor_closed(cursor);


Return to bug 427030

Lines 27-33 Link Here

(-)bdb/bdb_stubs.c.orig (-12 / +12 lines)
27	#define False 0	27	#define False 0
28		28
29		29
30	void bzero(void* addr,size_t n) {	30	void zerob(void* addr,size_t n) {
31	memset(addr,0,n);	31	memset(addr,0,n);
32	}	32	}
33		33
Lines 210-216 Link Here
210	// calls to DB->err and DBENV->err lead to exceptions.	210	// calls to DB->err and DBENV->err lead to exceptions.
211		211
212	// FIX: currently, prefix is ignored. Should be concatenated.	212	// FIX: currently, prefix is ignored. Should be concatenated.
213	void raise_db_cb(const DB_ENV dbenv, const char prefix, char *msg) {	213	void raise_db_cb(const DB_ENV dbenv, const char prefix, const char *msg) {
214	raise_db(msg);	214	raise_db(msg);
215	}	215	}
216		216
Lines 512-518 Link Here
512		512
513	test_db_closed(db);	513	test_db_closed(db);
514		514
515	bzero(&dbt,sizeof(DBT));	515	zerob(&dbt,sizeof(DBT));
516		516
517	dbt.data = String_val(key);	517	dbt.data = String_val(key);
518	dbt.size = string_length(key);	518	dbt.size = string_length(key);
Lines 542-548 Link Here
542		542
543	test_db_closed(db);	543	test_db_closed(db);
544		544
545	bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));	545	zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
546		546
547	key.data = String_val(vkey);	547	key.data = String_val(vkey);
548	key.size = string_length(vkey);	548	key.size = string_length(vkey);
Lines 577-583 Link Here
577		577
578	test_db_closed(db);	578	test_db_closed(db);
579		579
580	bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));	580	zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
581		581
582	key.data = String_val(vkey);	582	key.data = String_val(vkey);
583	key.size = string_length(vkey);	583	key.size = string_length(vkey);
Lines 827-833 Link Here
827		827
828	test_cursor_closed(cursor);	828	test_cursor_closed(cursor);
829		829
830	bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));	830	zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
831		831
832	data.data = String_val(vdata);	832	data.data = String_val(vdata);
833	data.size = string_length(vdata);	833	data.size = string_length(vdata);
Lines 851-857 Link Here
851		851
852	test_cursor_closed(cursor);	852	test_cursor_closed(cursor);
853		853
854	bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));	854	zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
855		855
856	key.data = String_val(vkey);	856	key.data = String_val(vkey);
857	key.size = string_length(vkey);	857	key.size = string_length(vkey);
Lines 880-886 Link Here
880		880
881	test_cursor_closed(cursor);	881	test_cursor_closed(cursor);
882		882
883	bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));	883	zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
884		884
885	key.data = String_val(vkey);	885	key.data = String_val(vkey);
886	key.size = string_length(vkey);	886	key.size = string_length(vkey);
Lines 906-912 Link Here
906	int flags = convert_flag_list(vflags,cursor_get_flags) \| DB_SET_RANGE;	906	int flags = convert_flag_list(vflags,cursor_get_flags) \| DB_SET_RANGE;
907	int err;	907	int err;
908		908
909	bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));	909	zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
910		910
911	test_cursor_closed(cursor);	911	test_cursor_closed(cursor);
912		912
Lines 948-954 Link Here
948	flags = convert_flag_list(vflags,cursor_get_flags) \| DB_GET_BOTH;	948	flags = convert_flag_list(vflags,cursor_get_flags) \| DB_GET_BOTH;
949	test_cursor_closed(cursor);	949	test_cursor_closed(cursor);
950		950
951	bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));	951	zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
952		952
953	key.data = String_val(vkey);	953	key.data = String_val(vkey);
954	key.size = string_length(vkey);	954	key.size = string_length(vkey);
Lines 975-981 Link Here
975	int flags = Flag_val(vtype,cursor_get_type) \|	975	int flags = Flag_val(vtype,cursor_get_type) \|
976	convert_flag_list(vflags,cursor_get_flags);	976	convert_flag_list(vflags,cursor_get_flags);
977	int err;	977	int err;
978	bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));	978	zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
979		979
980	test_cursor_closed(cursor);	980	test_cursor_closed(cursor);
981		981
Lines 1005-1011 Link Here
1005	int flags = Flag_val(vtype,cursor_get_type) \|	1005	int flags = Flag_val(vtype,cursor_get_type) \|
1006	convert_flag_list(vflags,cursor_get_flags);	1006	convert_flag_list(vflags,cursor_get_flags);
1007	int err;	1007	int err;
1008	bzero(&key,sizeof(DBT)); bzero(&data,sizeof(DBT));	1008	zerob(&key,sizeof(DBT)); zerob(&data,sizeof(DBT));
1009		1009
1010	test_cursor_closed(cursor);	1010	test_cursor_closed(cursor);
1011		1011