[Emacs-diffs] Changes to emacs/src/macselect.c

[YAMAMOTO Mitsuharu]

Index: emacs/src/macselect.c
diff -c emacs/src/macselect.c:1.5 emacs/src/macselect.c:1.6
*** emacs/src/macselect.c:1.5   Mon Jul  4 16:06:33 2005
--- emacs/src/macselect.c       Thu Jul 14 09:23:12 2005
***************
*** 371,377 ****
    err = GetScrapFlavorCount (scrap, &count);
    if (err == noErr)
      flavor_info = xmalloc (sizeof (ScrapFlavorInfo) * count);
!   if (err == noErr && flavor_info)
      {
        err = GetScrapFlavorInfoList (scrap, &count, flavor_info);
        if (err != noErr)
--- 371,377 ----
    err = GetScrapFlavorCount (scrap, &count);
    if (err == noErr)
      flavor_info = xmalloc (sizeof (ScrapFlavorInfo) * count);
!   if (flavor_info)
      {
        err = GetScrapFlavorInfoList (scrap, &count, flavor_info);
        if (err != noErr)
***************
*** 380,385 ****
--- 380,387 ----
          flavor_info = NULL;
        }
      }
+   if (flavor_info == NULL)
+     count = 0;
  #endif
    for (rest = Vselection_converter_alist; CONSP (rest); rest = XCDR (rest))
      {