diff options
| author | Christiaan Welvaart <cjw@mageia.org> | 2011-07-15 09:13:12 +0000 |
|---|---|---|
| committer | Christiaan Welvaart <cjw@mageia.org> | 2011-07-15 09:13:12 +0000 |
| commit | cb443900ba9aa12c691441c23e0f858c3c3e694f (patch) | |
| tree | 803cce26893ab027f587fbac8f2a9322607734ef | |
| parent | 52572ab6938ee2c57edaff9b1efa1aa13ddd53ac (diff) | |
| download | rpm-setup-cb443900ba9aa12c691441c23e0f858c3c3e694f.tar rpm-setup-cb443900ba9aa12c691441c23e0f858c3c3e694f.tar.gz rpm-setup-cb443900ba9aa12c691441c23e0f858c3c3e694f.tar.bz2 rpm-setup-cb443900ba9aa12c691441c23e0f858c3c3e694f.tar.xz rpm-setup-cb443900ba9aa12c691441c23e0f858c3c3e694f.zip | |
- g-ir-extract-deps: when deps offset is zero, bail out to prevent 1.139
bogus typelib(GOBJ) dependencies
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | g-ir-extract-deps.c | 16 |
3 files changed, 14 insertions, 7 deletions
@@ -1,3 +1,6 @@ +Version 1.139 -15 July 2011, by Christiaan Welvaart +- gi interdependencies: deps offset 0 means no dependencies + Version 1.138 - 7 July 2011, by Christiaan Welvaart - gi deps for python: accept arbitrary whitespace in dependency lists diff --git a/configure.ac b/configure.ac index 2929570..a45dd5b 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $ AC_PREREQ(2.59) -AC_INIT(rpm-mageia-setup, 1.138, boklm@mars-attacks.org) +AC_INIT(rpm-mageia-setup, 1.139, boklm@mars-attacks.org) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.9 -Wno-portability) AC_CONFIG_SRCDIR diff --git a/g-ir-extract-deps.c b/g-ir-extract-deps.c index 1c1735d..f0cf725 100644 --- a/g-ir-extract-deps.c +++ b/g-ir-extract-deps.c @@ -52,17 +52,21 @@ int main(int argc, char ** argv) fprintf(stderr, "failed to read deps offset from typelib\n"); exit(1); } - fseek(typelib, deps_offset, SEEK_SET); - if (fscanf(typelib, "%8191s", deps) < 1) + if (deps_offset > 0) { - fprintf(stderr, "failed to read deps from typelib\n"); - exit(1); - } + fseek(typelib, deps_offset, SEEK_SET); + if (fscanf(typelib, "%8191s", deps) < 1) + { + fprintf(stderr, "failed to read deps from typelib\n"); + exit(1); + } + printf("%s\n", deps); + } + free(deps); free(magic); fclose(typelib); - printf("%s\n", deps); return 0; } |