diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2005-07-14 09:23:12 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2005-07-14 09:23:12 +0000 |
| commit | 5cf69ede95aaba06415ded7d3156833bb8c6ec86 (patch) | |
| tree | ca685c297e5b6f3b057e92f7c688facc7bbdafab /src/macselect.c | |
| parent | 2db964b4144924173126b8e3690b58996330eb0d (diff) | |
| download | emacs-5cf69ede95aaba06415ded7d3156833bb8c6ec86.tar.gz | |
(get_scrap_target_type_list): Avoid NULL pointer dereference.
Diffstat (limited to 'src/macselect.c')
| -rw-r--r-- | src/macselect.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/macselect.c b/src/macselect.c index b519950eb75..94fe591a206 100644 --- a/src/macselect.c +++ b/src/macselect.c @@ -371,7 +371,7 @@ get_scrap_target_type_list (scrap) err = GetScrapFlavorCount (scrap, &count); if (err == noErr) flavor_info = xmalloc (sizeof (ScrapFlavorInfo) * count); - if (err == noErr && flavor_info) + if (flavor_info) { err = GetScrapFlavorInfoList (scrap, &count, flavor_info); if (err != noErr) @@ -380,6 +380,8 @@ get_scrap_target_type_list (scrap) flavor_info = NULL; } } + if (flavor_info == NULL) + count = 0; #endif for (rest = Vselection_converter_alist; CONSP (rest); rest = XCDR (rest)) { |