[DSOUND] propset smatch fix

Robert Reif reif at earthlink.net
Mon Mar 14 22:00:07 CST 2005


Unconditionally free memory.

Should make smatch happy.
-------------- next part --------------
Index: dlls/dsound/propset.c
===================================================================
RCS file: /home/wine/wine/dlls/dsound/propset.c,v
retrieving revision 1.34
diff -u -p -r1.34 propset.c
--- dlls/dsound/propset.c	14 Mar 2005 10:03:54 -0000	1.34
+++ dlls/dsound/propset.c	15 Mar 2005 03:51:38 -0000
@@ -1092,12 +1092,11 @@ static HRESULT WINAPI DSPROPERTY_Enumera
 
                                         TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
                                         (ppd->Callback)(&data, ppd->Context);
-
-                                        HeapFree(GetProcessHeap(),0,szInterface);
                                     }
+                                    HeapFree(GetProcessHeap(),0,szInterface);
                                 }
-                                HeapFree(GetProcessHeap(),0,nameW);
 			    }
+                            HeapFree(GetProcessHeap(),0,nameW);
 			}
 		    }
 		}
@@ -1126,12 +1125,11 @@ static HRESULT WINAPI DSPROPERTY_Enumera
 
                                         TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
                                         (ppd->Callback)(&data, ppd->Context);
-
-                                        HeapFree(GetProcessHeap(),0,szInterface);
                                     }
+                                    HeapFree(GetProcessHeap(),0,szInterface);
                                 }
-                                HeapFree(GetProcessHeap(),0,nameW);
 			    }
+                            HeapFree(GetProcessHeap(),0,nameW);
 			}
 		    }
 		}
@@ -1198,12 +1196,12 @@ static HRESULT WINAPI DSPROPERTY_Enumera
                                         TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
                                         (ppd->Callback)(&data, ppd->Context);
                             	    }
-                                    HeapFree(GetProcessHeap(),0,wInterface);
                                 }
+                                HeapFree(GetProcessHeap(),0,wInterface);
 			    }
-                            HeapFree(GetProcessHeap(),0,wDescription);
-                            HeapFree(GetProcessHeap(),0,wModule);
 			}
+                        HeapFree(GetProcessHeap(),0,wDescription);
+                        HeapFree(GetProcessHeap(),0,wModule);
 		    }
 		}
 
@@ -1235,12 +1233,12 @@ static HRESULT WINAPI DSPROPERTY_Enumera
                                         TRACE("calling Callback(%p,%p)\n", &data, ppd->Context);
                                         (ppd->Callback)(&data, ppd->Context);
                                     }
-                                    HeapFree(GetProcessHeap(),0,wInterface);
                                 }
+                                HeapFree(GetProcessHeap(),0,wInterface);
 			    }
-                            HeapFree(GetProcessHeap(),0,wDescription);
-                            HeapFree(GetProcessHeap(),0,wModule);
 			}
+                        HeapFree(GetProcessHeap(),0,wDescription);
+                        HeapFree(GetProcessHeap(),0,wModule);
 		    }
 		}
 


More information about the wine-patches mailing list