? diff ? test.c Index: client/attribute.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/attribute.c,v retrieving revision 1.6 diff -u -r1.6 attribute.c --- client/attribute.c 2002/02/11 10:37:38 1.6 +++ client/attribute.c 2002/02/21 14:30:20 @@ -209,8 +209,10 @@ if (hash_num_entries(attribute_hash) == 0) return; - if (pplayer->attribute_block.data) + if (pplayer->attribute_block.data) { free(pplayer->attribute_block.data); + pplayer->attribute_block.data = NULL; + } serialize_hash(attribute_hash, &(pplayer->attribute_block.data), &(pplayer->attribute_block.length)); Index: client/climisc.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/climisc.c,v retrieving revision 1.81 diff -u -r1.81 climisc.c --- client/climisc.c 2002/02/19 16:41:16 1.81 +++ client/climisc.c 2002/02/21 14:30:21 @@ -76,12 +76,14 @@ if(punit==ufocus) { set_unit_focus_no_center(NULL); game_remove_unit(punit); + punit = ufocus = NULL; advance_unit_focus(); } else { /* calculate before punit disappears, use after punit removed: */ bool update = (ufocus && ufocus->x==punit->x && ufocus->y==punit->y); game_remove_unit(punit); + punit = NULL; if (update) { update_unit_pix_label(ufocus); } Index: client/clinet.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/clinet.c,v retrieving revision 1.62 diff -u -r1.62 clinet.c --- client/clinet.c 2002/02/19 16:41:16 1.62 +++ client/clinet.c 2002/02/21 14:30:21 @@ -193,7 +193,9 @@ freelog(LOG_ERROR, "Unexpected buffers in try_to_connect()"); /* get newly initialized ones instead */ free_socket_packet_buffer(aconnection.buffer); + aconnection.buffer = NULL; free_socket_packet_buffer(aconnection.send_buffer); + aconnection.send_buffer = NULL; } aconnection.buffer = new_socket_packet_buffer(); @@ -322,6 +324,7 @@ packet = get_packet_from_connection(&aconnection, &type, &result); if (result) { handle_packet_input(packet, type); + packet = NULL; } else { break; } @@ -360,6 +363,7 @@ } handle_packet_input(packet, type); + packet = NULL; if (type == PACKET_PROCESSING_FINISHED) { freelog(LOG_DEBUG, "ifstrgp: expect=%d, seen=%d", Index: client/control.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/control.c,v retrieving revision 1.70 diff -u -r1.70 control.c --- client/control.c 2002/02/19 16:41:16 1.70 +++ client/control.c 2002/02/21 14:30:22 @@ -387,6 +387,7 @@ genlist_unlink(&arrival_queue, p_id); id = *p_id; free(p_id); + p_id = NULL; punit = player_find_unit_by_id(game.player_ptr, id); if (punit && (unit_can_help_build_wonder_here(punit) @@ -444,6 +445,7 @@ diplomat_id = p_ids[0]; victim_id = p_ids[1]; free(p_ids); + p_ids = NULL; pdiplomat = player_find_unit_by_id(game.player_ptr, diplomat_id); pcity = find_city_by_id(victim_id); punit = find_unit_by_id(victim_id); Index: client/goto.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/goto.c,v retrieving revision 1.36 diff -u -r1.36 goto.c --- client/goto.c 2002/02/19 20:03:02 1.36 +++ client/goto.c 2002/02/21 14:30:23 @@ -828,6 +828,7 @@ p.pos[j].y = punit->y; send_packet_goto_route(&aconnection, &p, ROUTE_PATROL); free(p.pos); + p.pos = NULL; } /********************************************************************** @@ -847,4 +848,5 @@ } send_packet_goto_route(&aconnection, &p, ROUTE_GOTO); free(p.pos); + p.pos = NULL; } Index: client/helpdata.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/helpdata.c,v retrieving revision 1.47 diff -u -r1.47 helpdata.c --- client/helpdata.c 2002/02/19 16:41:17 1.47 +++ client/helpdata.c 2002/02/21 14:30:23 @@ -344,12 +344,14 @@ } } free(paras); + paras = NULL; wordwrap_string(long_buffer, 68); pitem->text=mystrdup(long_buffer); genlist_insert(&help_nodes, pitem, -1); } free(sec); + sec = NULL; section_file_check_unused(sf, sf->filename); section_file_free(sf); booted = TRUE; Index: client/packhand.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/packhand.c,v retrieving revision 1.220 diff -u -r1.220 packhand.c --- client/packhand.c 2002/02/21 08:46:44 1.220 +++ client/packhand.c 2002/02/21 14:30:25 @@ -1286,6 +1286,7 @@ return; } client_remove_cli_conn(pconn); + pconn = NULL; } else { /* Add or update the connection */ @@ -1652,6 +1653,7 @@ free(get_government(i)->helptext); } free(governments); + governments = NULL; game.aqueduct_size = packet->aqueduct_size; game.sewer_size = packet->sewer_size; Index: client/tilespec.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/tilespec.c,v retrieving revision 1.69 diff -u -r1.69 tilespec.c --- client/tilespec.c 2002/02/19 16:41:18 1.69 +++ client/tilespec.c 2002/02/21 14:30:26 @@ -391,9 +391,11 @@ small_sprite); } free(tags); + tags = NULL; } } free(gridnames); + gridnames = NULL; free_sprite(big_sprite); @@ -1718,14 +1720,20 @@ int i; for (i=0; ifilename, fz_strerror(inf->fp)); fz_fclose(inf->fp); + inf->fp = NULL; } else if (fz_fclose(inf->fp) != 0) { freelog(LOG_ERROR, "Error closing %s", inf->filename); } free(inf->filename); + inf->filename = NULL; astr_free(&inf->cur_line); astr_free(&inf->copy_line); astr_free(&inf->token); Index: common/nation.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/common/nation.c,v retrieving revision 1.20 diff -u -r1.20 nation.c --- common/nation.c 2002/02/14 15:17:15 1.20 +++ common/nation.c 2002/02/21 14:30:28 @@ -178,6 +178,7 @@ } } free(nations); + nations = NULL; } /*************************************************************** Index: common/player.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/common/player.c,v retrieving revision 1.88 diff -u -r1.88 player.c --- common/player.c 2002/02/21 09:44:52 1.88 +++ common/player.c 2002/02/21 14:30:29 @@ -156,16 +156,18 @@ { int i; - if (plr->island_improv) + if (plr->island_improv) { free(plr->island_improv); + plr->island_improv = NULL; + } + if (plr->island_effects) { for (i=0; i<=numcont; i++) { geff_vector_free(&plr->island_effects[i]); } free(plr->island_effects); + plr->island_effects = NULL; } - plr->island_improv=NULL; - plr->island_effects=NULL; } /*************************************************************** Index: common/registry.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/common/registry.c,v retrieving revision 1.44 diff -u -r1.44 registry.c --- common/registry.c 2002/02/16 17:05:08 1.44 +++ common/registry.c 2002/02/21 14:30:29 @@ -285,9 +285,10 @@ /* free the real data: */ sbuf_free(file->sb); - free(file->filename); - file->sb = NULL; + + free(file->filename); + file->filename = NULL; } /************************************************************************** @@ -514,6 +515,7 @@ } inf_close(inf); + inf = NULL; astr_free(&base_name); astr_free(&entry_name); @@ -1173,6 +1175,7 @@ secfilehash_check(file); hash_free(file->hashd->htbl); free(file->hashd); + file->hashd = NULL; } /************************************************************************** Index: common/shared.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/common/shared.c,v retrieving revision 1.77 diff -u -r1.77 shared.c --- common/shared.c 2002/02/19 15:21:05 1.77 +++ common/shared.c 2002/02/21 14:30:30 @@ -559,8 +559,8 @@ home_dir=fc_malloc(PATH_MAX); if (!getcwd(home_dir,PATH_MAX)) { free(home_dir); - freelog(LOG_ERROR, "Could not find home directory (HOME is not set)"); home_dir=NULL; + freelog(LOG_ERROR, "Could not find home directory (HOME is not set)"); } #else freelog(LOG_ERROR, "Could not find home directory (HOME is not set)"); @@ -693,6 +693,7 @@ freelog(LOG_VERBOSE, "Data path component (%d): %s", num_dirs-1, tok); if (i == -1) { free(tok); + tok = NULL; } } Index: server/citytools.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/server/citytools.c,v retrieving revision 1.165 diff -u -r1.165 citytools.c --- server/citytools.c 2002/02/21 09:44:52 1.165 +++ server/citytools.c 2002/02/21 14:30:31 @@ -810,6 +810,7 @@ resolve_unit_stack(resolve_list[i].x, resolve_list[i].y, transfer_unit_verbose); free(resolve_list); + resolve_list = NULL; } /* Update the city's trade routes. */ Index: server/gamehand.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/server/gamehand.c,v retrieving revision 1.106 diff -u -r1.106 gamehand.c --- server/gamehand.c 2002/02/14 15:17:29 1.106 +++ server/gamehand.c 2002/02/21 14:30:32 @@ -94,6 +94,7 @@ } } free(pos_used); + pos_used = NULL; } /* Loop over all players, creating their initial units... */ Index: server/gotohand.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/server/gotohand.c,v retrieving revision 1.137 diff -u -r1.137 gotohand.c --- server/gotohand.c 2002/02/14 15:17:30 1.137 +++ server/gotohand.c 2002/02/21 14:30:33 @@ -1475,8 +1475,10 @@ static void dealloc_refuel_stack(void) { int i; - for (i = 0; i < refuellist_size; i++) + for (i = 0; i < refuellist_size; i++) { free(refuels[i]); + refuels[i] = NULL; + } } /************************************************************************** Index: server/mapgen.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/server/mapgen.c,v retrieving revision 1.87 diff -u -r1.87 mapgen.c --- server/mapgen.c 2002/02/14 15:17:33 1.87 +++ server/mapgen.c 2002/02/21 14:30:34 @@ -752,6 +752,7 @@ current_riverlength, desirable_riverlength, iteration_counter); } /* end while; */ free(river_map); + river_map = NULL; } /************************************************************************** @@ -1339,6 +1340,7 @@ make_land(); free(height_map); + height_map = NULL; } /************************************************************************** @@ -1886,6 +1888,7 @@ } make_plains(); free(height_map); + height_map = NULL; if(checkmass>map.xsize+map.ysize+totalweight) { freelog(LOG_VERBOSE, "%ld mass left unplaced", checkmass); @@ -1970,6 +1973,7 @@ make_plains(); free(height_map); + height_map = NULL; if(j==1500) { freelog(LOG_NORMAL, _("Generator 3 left %li landmass unplaced."), checkmass); @@ -2045,6 +2049,7 @@ } make_plains(); free(height_map); + height_map = NULL; if(checkmass>map.xsize+map.ysize+totalweight) { freelog(LOG_VERBOSE, "%ld mass left unplaced", checkmass); Index: server/plrhand.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/server/plrhand.c,v retrieving revision 1.217 diff -u -r1.217 plrhand.c --- server/plrhand.c 2002/02/21 09:44:53 1.217 +++ server/plrhand.c 2002/02/21 14:30:36 @@ -879,6 +879,7 @@ for (i = 0; i < tot_units * 2; i += 2) resolve_unit_stack(resolve_list[i], resolve_list[i+1], TRUE); free(resolve_list); + resolve_list = NULL; } } @@ -1548,6 +1549,7 @@ cplayer->nation = nations_used[i]; free(nations_used); + nations_used = NULL; pick_ai_player_name(cplayer->nation,cplayer->name); sz_strlcpy(cplayer->username, cplayer->name); Index: server/sernet.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/server/sernet.c,v retrieving revision 1.84 diff -u -r1.84 sernet.c --- server/sernet.c 2002/02/14 15:17:38 1.84 +++ server/sernet.c 2002/02/21 14:30:37 @@ -569,6 +569,8 @@ pconn->server. last_request_id_seen); command_ok = handle_packet_input(pconn, packet, type); + packet = NULL; + finish_processing_request(pconn); connection_do_unbuffer(pconn); if (!command_ok) { Index: server/unithand.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/server/unithand.c,v retrieving revision 1.216 diff -u -r1.216 unithand.c --- server/unithand.c 2002/02/21 08:38:57 1.216 +++ server/unithand.c 2002/02/21 14:30:39 @@ -1472,6 +1472,7 @@ if (!check_route(pplayer, packet)) { free(packet->pos); + packet->pos = NULL; return; } Index: server/unittools.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/server/unittools.c,v retrieving revision 1.159 diff -u -r1.159 unittools.c --- server/unittools.c 2002/02/19 15:21:06 1.159 +++ server/unittools.c 2002/02/21 14:30:42 @@ -1746,6 +1746,7 @@ if (punit->pgr) { free(punit->pgr->pos); free(punit->pgr); + punit->pgr = NULL; } packet.value = punit->id; @@ -1756,7 +1757,8 @@ } } players_iterate_end; - game_remove_unit(punit); + game_remove_unit(punit); + punit = NULL; /* This unit may have blocked tiles of adjacent cities. Update them. */ map_city_radius_iterate(punit_x, punit_y, x1, y1) {