← Back to branch summary

~jamesodhunt/ubuntu/vivid/upstart/bug-1447756

« back to all changes in this revision

Viewing changes to init/job_class.c

  • Committer: James Hunt
  • Date: 2014-03-11 15:23:07 UTC
  • mfrom: (1182.135.76 upstart)
  • mto: This revision was merged to the branch mainline in revision 1544.
  • Revision ID: james.hunt@ubuntu.com-20140311152307-ad1wi9qxurjrui8j
Tags: upstream-1.12.1
Import upstream version 1.12.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
init/job_class.c
1241
1241
        if (job->stop_env)
1242
1242
                nih_unref (job->stop_env, job);
1243
1243
 
1244
 
        job->stop_env = (char **)env;
1245
 
        nih_ref (job->stop_env, job);
 
1244
        job->stop_env = nih_str_array_copy (job, NULL, env);
 
1245
        if (! job->stop_env)
 
1246
                nih_return_system_error (-1);
1246
1247
 
1247
1248
        job_finished (job, FALSE);
1248
1249
        if (blocked)
2429
2430
                if (! state_check_json_type (json_class, object))
2430
2431
                        goto error;
2431
2432
 
 
2433
                /* Responsible for associating a JobClass with its
 
2434
                 * parent ConfFile.
 
2435
                 */
2432
2436
                class = job_class_deserialise (json_class);
2433
2437
 
2434
2438
                /* Either memory is low or -- more likely -- a JobClass