← Back to branch summary

~jderose/ubuntu/raring/qemu/vde-again

« back to all changes in this revision

Viewing changes to block-cloop.c

  • Committer: Bazaar Package Importer
  • Author(s): Aurelien Jarno, Aurelien Jarno
  • Date: 2009-03-07 06:20:34 UTC
  • mfrom: (1.1.9 upstream)
  • mto: This revision was merged to the branch mainline in revision 7.
  • Revision ID: james.westby@ubuntu.com-20090307062034-i3pead4mw653v2el
Tags: 0.10.0-1
http://bugs.debian.org/514462
http://bugs.debian.org/470231
http://bugs.debian.org/415996
http://bugs.debian.org/513210
http://bugs.debian.org/297572
[ Aurelien Jarno ]
* New upstream release:
  - Fix fr-be keyboard mapping (closes: bug#514462).
  - Fix stat64 structure on ppc-linux-user (closes: bug#470231).
  - Add a chroot option (closes: bug#415996).
  - Add evdev support (closes: bug#513210).
  - Fix loop on symlinks in user mode (closes: bug#297572).
  - Bump depends on openbios-sparc.
  - Depends on openbios-ppc.
  - Update 12_signal_powerpc_support.patch.
  - Update 21_net_soopts.patch.
  - Drop 44_socklen_t_check.patch (merged upstream).
  - Drop 49_null_check.patch (merged upstream).
  - Update 64_ppc_asm_constraints.patch.
  - Drop security/CVE-2008-0928-fedora.patch (merged upstream).
  - Drop security/CVE-2007-5730.patch (merged upstream).
* patches/80_stable-branch.patch: add patches from stable branch:
  - Fix race condition between signal handler/execution loop (closes:
    bug#474386, bug#501731).
* debian/copyright: update.
* Compile and install .dtb files:
  - debian/control: build-depends on device-tree-compiler.
  - debian/patches/81_compile_dtb.patch: new patch from upstream.
  - debian/rules: compile and install bamboo.dtb and mpc8544.dtb.

Show diffs side-by-side

added added

removed removed

Lines of Context:
block-cloop.c
75
75
 
76
76
    /* read offsets */
77
77
    offsets_size=s->n_blocks*sizeof(uint64_t);
78
 
    if(!(s->offsets=(uint64_t*)malloc(offsets_size)))
79
 
        goto cloop_close;
 
78
    s->offsets=(uint64_t*)qemu_malloc(offsets_size);
80
79
    if(read(s->fd,s->offsets,offsets_size)<offsets_size)
81
80
        goto cloop_close;
82
81
    for(i=0;i<s->n_blocks;i++) {
89
88
    }
90
89
 
91
90
    /* initialize zlib engine */
92
 
    if(!(s->compressed_block = malloc(max_compressed_block_size+1)))
93
 
        goto cloop_close;
94
 
    if(!(s->uncompressed_block = malloc(s->block_size)))
95
 
        goto cloop_close;
 
91
    s->compressed_block = qemu_malloc(max_compressed_block_size+1);
 
92
    s->uncompressed_block = qemu_malloc(s->block_size);
96
93
    if(inflateInit(&s->zstream) != Z_OK)
97
94
        goto cloop_close;
98
95
    s->current_block=s->n_blocks;
165
162
    NULL,
166
163
    cloop_close,
167
164
};
168
 
 
169