Don't crash when calling DirectDrawSurface::EnumAttachedSurfaces on a

surface with no attached surfaces.

Don't crash when calling DirectDrawSurface::EnumAttachedSurfaces on a
ba0a5336 · James Abbatiello · Alexandre Julliard · dbdd94ba · ba0a5336
Commit ba0a5336 authored Aug 22, 2000 by James Abbatiello Committed by Alexandre Julliard Aug 22, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

main.c dlls/ddraw/dsurface/main.c +6 -4

No files found.
--- a/dlls/ddraw/dsurface/main.c
+++ b/dlls/ddraw/dsurface/main.c
@@ -867,10 +867,12 @@ HRESULT WINAPI IDirectDrawSurface4Impl_EnumAttachedSurfaces(
    struct _surface_chain *chain = This->s.chain;

    TRACE("(%p)->(%p,%p)\n",This,context,esfcb);
-    for (i=0;i<chain->nrofsurfaces;i++) {
-      TRACE( "Enumerating attached surface (%p)\n", chain->surfaces[i]);
-      if (esfcb((LPDIRECTDRAWSURFACE) chain->surfaces[i], &(chain->surfaces[i]->s.surface_desc), context) == DDENUMRET_CANCEL)
-	return DD_OK; /* FIXME: return value correct? */
+    if (chain) {
+	for (i=0;i<chain->nrofsurfaces;i++) {
+	    TRACE( "Enumerating attached surface (%p)\n", chain->surfaces[i]);
+	    if (esfcb((LPDIRECTDRAWSURFACE) chain->surfaces[i], &(chain->surfaces[i]->s.surface_desc), context) == DDENUMRET_CANCEL)
+		return DD_OK; /* FIXME: return value correct? */
+	}
    }
    return DD_OK;
 }