← Back to branch summary

~ubuntu-branches/ubuntu/trusty/grub2/trusty

« back to all changes in this revision

Viewing changes to grub-core/gnulib-fix-null-deref.diff

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2014-01-16 15:18:04 UTC
  • mfrom: (17.6.38 experimental)
  • Revision ID: package-import@ubuntu.com-20140116151804-3foouk7fpqcq3sxx
Tags: 2.02~beta2-2
* Convert patch handling to git-dpm.
* Add bi-endian support to ELF parser (Tomohiro B Berry).
* Adjust restore_mkdevicemap.patch to mark get_kfreebsd_version as static,
  to appease "gcc -Werror=missing-prototypes".
* Cherry-pick from upstream:
  - Change grub-macbless' manual page section to 8.
* Install grub-glue-efi, grub-macbless, grub-render-label, and
  grub-syslinux2cfg.
* grub-shell: Pass -no-pad to xorriso when building floppy images.

Show diffs side-by-side

added added

removed removed

Lines of Context:
grub-core/gnulib-fix-null-deref.diff
 
1
=== modified file 'grub-core/gnulib/argp-parse.c'
 
2
--- grub-core/gnulib/argp-parse.c       2010-04-02 22:45:01 +0000
 
3
+++ grub-core/gnulib/argp-parse.c       2011-04-10 13:25:52 +0000
 
4
@@ -935,7 +935,7 @@
 
5
 void *
 
6
 __argp_input (const struct argp *argp, const struct argp_state *state)
 
7
 {
 
8
-  if (state)
 
9
+  if (state && state->pstate)
 
10
     {
 
11
       struct group *group;
 
12
       struct parser *parser = state->pstate;
 
13