vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* grub-core/partmap/bsdlabel.c (iterate_real): Fix freeing of static 

buffer.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-10 12:43:11 +01:00
parent a655c182c5
commit 31a2600267
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ChangeLog
View File

@ -1,3 +1,26 @@
2012-02-10 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/partmap/bsdlabel.c (iterate_real): Fix freeing of static
buffer.
2012-02-10 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/LzmaEnc.c (LzmaEnc_FastPosInit): Made static.
(LzmaEnc_SaveState): Removed (unused).
(LzmaEnc_RestoreState): Likewise.
(LzmaEnc_InitPriceTables): Made static.
(LzmaEnc_Construct): Likewise.
(LzmaEnc_FreeLits): Likewise.
(LzmaEnc_Destruct): Likewise.
(LzmaEnc_Init): Likewise.
(LzmaEnc_InitPrices): Likewise.
(LzmaEnc_Finish): Likewise.
(LzmaEnc_PrepareForLzma2): Removed (unused).
(LzmaEnc_MemPrepare): Likewise.
(LzmaEnc_GetNumAvailableBytes): Likewise.
(LzmaEnc_GetCurBuf): Likewise.
(LzmaEnc_CodeOneMemBlock): Likewise.
2012-02-10 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/ldm.c (grub_util_get_ldm): Remove unused variables.
@ -8,7 +31,7 @@
* util/grub-editenv.c (print_var): Rename name to varname to
avoid shadowing.
(main): Rename index to curindex to avoid shadowing.
MAke filename a const char *.
Make filename a const char *.
2012-02-10 Vladimir Serbinenko <phcoder@gmail.com>

5
grub-core/partmap/bsdlabel.c
View File

@ -105,9 +105,10 @@ iterate_real (grub_disk_t disk, grub_disk_addr_t sector, int freebsd,
char *partname;
/* disk->partition != NULL as 0 < delta */
partname = disk->partition ? grub_partition_get_name (disk->partition)
: "";
: 0;
grub_util_warn (_("Discarding improperly nested partition (%s,%s,%s%d)"),
disk->name, partname, p.partmap->name, p.number + 1);
disk->name, partname ? : "", p.partmap->name,
p.number + 1);
grub_free (partname);
#endif
continue;