/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to plugins.d/plymouth.c

  • Committer: Teddy Hogeborn
  • Date: 2016-06-21 20:47:59 UTC
  • mfrom: (345 release)
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 346.
  • Revision ID: teddy@recompile.se-20160621204759-18sq8k9ihnplz6x7
Merge from release branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/plymouth.c
2
2
/*
3
3
 * Plymouth - Read a password from Plymouth and output it
4
4
 * 
5
 
 * Copyright © 2010-2014 Teddy Hogeborn
6
 
 * Copyright © 2010-2014 Björn Påhlsson
 
5
 * Copyright © 2010-2016 Teddy Hogeborn
 
6
 * Copyright © 2010-2016 Björn Påhlsson
7
7
 * 
8
8
 * This program is free software: you can redistribute it and/or
9
9
 * modify it under the terms of the GNU General Public License as
174
174
      }
175
175
    }
176
176
    
177
 
    char **new_argv = NULL;
 
177
    char **new_argv = malloc(sizeof(const char *));
 
178
    if(new_argv == NULL){
 
179
      error_plus(0, errno, "malloc");
 
180
      _exit(EX_OSERR);
 
181
    }
178
182
    char **tmp;
179
183
    int i = 0;
180
184
    for (; argv[i]!=NULL; i++){
181
 
      tmp = realloc(new_argv, sizeof(const char *) * ((size_t)i + 1));
 
185
      tmp = realloc(new_argv, sizeof(const char *) * ((size_t)i + 2));
182
186
      if(tmp == NULL){
183
187
        error_plus(0, errno, "realloc");
184
188
        free(new_argv);