projects / packages / rpm.git / blame
| Commit | Line | Data |
|---|---|---|
| 70f8787d JR |
1 | --- rpm-5.4.7/build/parseReqs.c.memleak~ 2012-03-21 19:13:54.725053861 +0100 |
| 2 | +++ rpm-5.4.7/build/parseReqs.c 2012-03-21 19:13:57.755057614 +0100 | |
| 3 | @@ -177,7 +177,7 @@ rpmRC parseRCPOT(Spec spec, Package pkg, | |
| 4 | if (!(nr > 3 && EVR[0] == '%' && EVR[1] == '{' && EVR[nr-1] == '}')) | |
| 5 | { | |
| 6 | memset(evr, 0, sizeof(*evr)); | |
| 7 | - ix = rpmEVRparse(xstrdup(EVR), evr); | |
| 8 | + ix = rpmEVRparse(EVR, evr); | |
| 9 | evr->str = _free(evr->str); | |
| 10 | } | |
| 11 | if (ix != 0) { | |
| 12 | --- rpm-5.4.7/rpmio/macro.c.memleak~ 2012-03-21 19:16:07.453218370 +0100 | |
| 13 | +++ rpm-5.4.7/rpmio/macro.c 2012-03-21 19:19:33.758488216 +0100 | |
| 14 | @@ -2818,8 +2818,10 @@ rpmLoadMacroFile(MacroContext mc, const | |
| 15 | } | |
| 16 | se = rpmMCExpand(mc, s, NULL); | |
| 17 | rc = rpmGlob(se, &argc, &argv); | |
| 18 | - for(i = 0; i < argc; i++) | |
| 19 | + for(i = 0; i < argc; i++) { | |
| 20 | rc |= rpmLoadMacroFile(mc, argv[i], nesting - 1); | |
| 21 | + argv[i] = _free(argv[i]); | |
| 22 | + } | |
| 23 | argv = _free(argv); | |
| 24 | se = _free(se); | |
| 25 | if (rc != 0) |