Commits

marcus  committed 38057b8

Fixed display detection for scrap module.

  • Participants
  • Parent commits 7355da1

Comments (0)

Files changed (2)

     _clipdata = PyDict_New ();
     _selectiondata = PyDict_New ();
 
+    /* In case we've got not video surface, we won't initialize
+     * anything.
+     */
+    if (!SDL_GetVideoSurface())
+        return RAISE (PyExc_SDLError, "No display mode is set");
     if (!pygame_scrap_init ())
         return RAISE (PyExc_SDLError, SDL_GetError ());
-
+    
     Py_RETURN_NONE;
 }
 #endif

File src/scrap_x11.c

     {
         unsigned long boffset = 0;
         chunk = MAX_CHUNK_SIZE(SDL_Display);
-        memset (retval, 0, *length + 1);
+        memset (retval, 0, (size_t) (*length + 1));
 
         /* Read as long as there is data. */
         while (overflow)
         if (!types)
             return NULL;
 
-        memset (types, 0, (PyDict_Size (dict) + 1));
+        memset (types, 0, (size_t) (PyDict_Size (dict) + 1));
         while (PyDict_Next (dict, &pos, &key, NULL))
         {
             types[i] = strdup (PyString_AsString (key));