← Back to branch summary

~cldunlap1/ubuntu/oneiric/alsa-utils/fix-for-816388

« back to all changes in this revision

Viewing changes to debian/patches/dont_free_if_init_file_doesnt_exist.patch

  • Committer: Bazaar Package Importer
  • Author(s): Daniel T Chen
  • Date: 2010-02-03 01:19:33 UTC
  • mfrom: (1.2.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20100203011933-xl5mh2yyc4gfkp9h
Tags: 1.0.22-0ubuntu1
* New upstream release
* debian/patches/:
  - alsactl_brace.patch:
  - show_avail_formats.patch:
  - dont_free_if_init_file_doesnt_exist.patch: Applied upstream.
  + backport-fixes-head.patch: (c2eaf8, 0034b1, cdc496)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/dont_free_if_init_file_doesnt_exist.patch
1
 
Index: alsa-utils-1.0.21/alsactl/init_parse.c
2
 
===================================================================
3
 
--- alsa-utils-1.0.21.orig/alsactl/init_parse.c 2009-12-15 18:58:53.000000000 -0500
4
 
+++ alsa-utils-1.0.21/alsactl/init_parse.c      2009-12-15 18:59:30.000000000 -0500
5
 
@@ -1731,10 +1731,12 @@
6
 
                        }
7
 
                        first = 0;
8
 
                        err = init_space(&space, card);
9
 
-                       if (err == 0 &&
10
 
-                           (space->rootdir = new_root_dir(filename)) != NULL)
11
 
-                               err = parse(space, filename);
12
 
-                       free_space(space);
13
 
+                       if (err == 0) {
14
 
+                               space->rootdir = new_root_dir(filename);
15
 
+                               if (space->rootdir != NULL)
16
 
+                                       err = parse(space, filename);
17
 
+                               free_space(space);
18
 
+                       }
19
 
                        if (err < 0)
20
 
                                break;
21
 
                }
22
 
@@ -1746,10 +1748,12 @@
23
 
                }
24
 
                memset(&space, 0, sizeof(space));
25
 
                err = init_space(&space, card);
26
 
-               if (err == 0 &&
27
 
-                   (space->rootdir = new_root_dir(filename)) != NULL)
28
 
-                       err = parse(space, filename);
29
 
-               free_space(space);
30
 
+               if (err == 0) {
31
 
+                       space->rootdir = new_root_dir(filename);
32
 
+                       if (space->rootdir  != NULL)
33
 
+                               err = parse(space, filename);
34
 
+                       free_space(space);
35
 
+               }
36
 
        }
37
 
   error:
38
 
        sysfs_cleanup();