Skip to content
Snippets Groups Projects

mkndx: various fixes

Merged mkndx: various fixes
sertonix/apk-tools:mkndx into master
1 unresolved thread
Merged Sertonix requested to merge sertonix/apk-tools:mkndx into master
1 unresolved thread

I am still trying to understand the adb code so please verify if this is correct!

Edited by Sertonix

Merge request reports

Merge request pipeline #310322 skipped

Merge request pipeline skipped for 684bef44

Approval is optional

Merged by Timo TeräsTimo Teräs 3 days ago (Mar 24, 2025 4:54am UTC)

Merge details

  • Changes merged into master with 684bef44.
  • Deleted the source branch.

Pipeline #310323 passed

Stage: test
Stage: build

Pipeline passed for 684bef44 on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Timo Teräs
  • Timo Teräs
  • Timo Teräs
    Timo Teräs @fabled started a thread on an old version of the diff
    • src/app_mkndx.c
    317 318 if (val == ADB_VAL_NULL && !ctx->filter_spec_set) {
    318 319 apk_digest_reset(&digest);
    319 320 apk_extract_reset(&ctx->ectx);
    321 adb_wo_reset(&ctx->pkginfo);
    • Timo Teräs
      Timo Teräs @fabled ·
      Maintainer

      How about move this to the below if error handling since that's the case where it is really needed. Otherwise there might be some confusion if this needs to be called in the normal path or not.

    • Sertonix
      Sertonix @sertonix ·
      Author Contributor

      As far as I can tell moving this below if (ADB_IS_ERROR(val)) { ... } might cause issue when the if (val == ADB_VAL_NULL) continue; branch is triggered.

    • Timo Teräs
      Timo Teräs @fabled ·
      Maintainer

      No, the val = adb_wa_append_obj(&ctx->pkgs, &ctx->pkginfo) will call reset on pkginfo. When an object is written out, the structure will get reset for use again automatically.

    • Sertonix changed this line in version 3 of the diff

      changed this line in version 3 of the diff

    • Sertonix
      Sertonix @sertonix ·
      Author Contributor

      That explains a lot. Not sure which if you meant but now it should only be called when really needed.

      Edited by Sertonix
    • Please register or sign in to reply
  • Timo Teräs
    Timo Teräs @fabled ·
    Maintainer

    Thanks, looks mostly good. Some fixex needed.

  • Sertonix added 6 commits

    added 6 commits

    • 6b31b387...aeb74de6 - 2 commits from branch alpine:master
    • 29afc695 - mkndx: fix memory leak when with large dependency list in v2 packages
    • 1e9c404d - mkndx: don't return ADB_ERROR from mkndx_parse_v2meta
    • 1b590863 - mkndx: reset pkginfo for each package
    • b9a76b03 - mkndx: remove workaround for abuild license field

    Compare with previous version

    Toggle commit list
  • Sertonix added 2 commits

    added 2 commits

    • dbc9fbdd - mkndx: reset pkginfo on error
    • c96e978f - mkndx: remove workaround for abuild license field

    Compare with previous version

  • Timo Teräs added 9 commits

    added 9 commits

    • c96e978f...d495be9e - 5 commits from branch alpine:master
    • 5348babe - mkndx: fix memory leak when with large dependency list in v2 packages
    • 11dd5923 - mkndx: don't return ADB_ERROR from mkndx_parse_v2meta
    • 8415dbf6 - mkndx: reset pkginfo on error
    • 684bef44 - mkndx: remove workaround for abuild license field

    Compare with previous version

    Toggle commit list
  • Timo Teräs merged

    merged

    • Please register or sign in to reply