Author: mlschroe Date: Tue Feb 19 19:16:09 2008 New Revision: 8822 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8822&view=rev Log: - patch memory leaks Modified: trunk/sat-solver/tools/common_write.c trunk/sat-solver/tools/repo_write.c Modified: trunk/sat-solver/tools/common_write.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/common_write.c?rev=8822&r1=8821&r2=8822&view=diff ============================================================================== --- trunk/sat-solver/tools/common_write.c (original) +++ trunk/sat-solver/tools/common_write.c Tue Feb 19 19:16:09 2008 @@ -100,5 +100,6 @@ fileinfo = fileinfoa; } repo_write(repo, stdout, keyfilter_solv, 0, fileinfo, nsubfiles); + sat_free(filter); return 0; } Modified: trunk/sat-solver/tools/repo_write.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_write.c?rev=8822&r1=8821&r2=8822&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_write.c (original) +++ trunk/sat-solver/tools/repo_write.c Tue Feb 19 19:16:09 2008 @@ -387,7 +387,6 @@ struct extdata *extdata; Id *dirused; - Id *dirmap; Id vstart; }; @@ -1165,8 +1164,7 @@ if (cbdata.dirused && !cbdata.dirused[0]) { /* no dirs used at all */ -fprintf(stderr, "no dirs used!\n"); - sat_free(cbdata.dirused); + cbdata.dirused = sat_free(cbdata.dirused); dirpool = 0; } if (dirpool) @@ -1243,7 +1241,6 @@ if (cbdata.dirused && !cbdata.dirused[1]) cbdata.dirused[1] = 1; /* always want / entry */ dirmap = sat_calloc(dirpool->ndirs, sizeof(Id)); - dirpool_make_dirtraverse(dirpool); dirmap[0] = 0; ndirmap = traverse_dirs(dirpool, dirmap, 1, dirpool_child(dirpool, 0), cbdata.dirused); if (!cbdata.dirused) @@ -1371,6 +1368,7 @@ else write_id(fp, nstrings - dirmap[i]); } + sat_free(dirmap); /* * write keys @@ -1378,7 +1376,7 @@ if (setfileinfo) { fileinfo->nkeys = cbdata.nmykeys; - fileinfo->keys = sat_calloc (fileinfo->nkeys, sizeof (*fileinfo->keys)); + fileinfo->keys = sat_calloc(fileinfo->nkeys, sizeof (*fileinfo->keys)); } for (i = 1; i < cbdata.nmykeys; i++) { @@ -1548,9 +1546,18 @@ for (i = 1; i < cbdata.nmykeys; i++) sat_free(cbdata.extdata[i].buf); + sat_free(cbdata.extdata); sat_free(needid); sat_free(cbdata.solvschemata); sat_free(cbdata.myschemadata); sat_free(cbdata.myschemata); + sat_free(cbdata.schema); + + sat_free(cbdata.mykeys); + sat_free(cbdata.keymap); + sat_free(cbdata.keymapstart); + sat_free(cbdata.dirused); + sat_free(cbdata.incorelen); + sat_free(repodataused); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org