Skip to content
Extraits de code Groupes Projets
Vérifiée Valider e25f40f8 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

Solve segfault

parent 7f1fbc73
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!99Multi add
# Maintainer: Maël 'Kubat' MARTIN <mael.martin31@gmail.com> # Maintainer: Maël 'Kubat' MARTIN <mael.martin31@gmail.com>
pkgname=lektor pkgname=lektor
pkgver=mk7.956.1e4b3aa pkgver=mk7.957.7f1fbc7
pkgrel=1 pkgrel=1
pkgdesc="The lektor kara player, from the Bakaclub" pkgdesc="The lektor kara player, from the Bakaclub"
arch=(x86_64 i686) arch=(x86_64 i686)
......
...@@ -28,17 +28,17 @@ bool command_stop (volatile sqlite3 *db, struct lkt_win *win, ...@@ -28,17 +28,17 @@ bool command_stop (volatile sqlite3 *db, struct lkt_win *win,
bool command_set_pos(volatile sqlite3 *db, struct lkt_win *win, mpd_idle_flag *watch_mask_ptr, int index); bool command_set_pos(volatile sqlite3 *db, struct lkt_win *win, mpd_idle_flag *watch_mask_ptr, int index);
/* The queue */ /* The queue */
bool command_add (volatile sqlite3 *db, struct lkt_win *win, char *args[LKT_MESSAGE_ARGS_MAX], mpd_idle_flag *watch_mask_ptr, bool command_add (volatile sqlite3 *db, struct lkt_win *win, char *args[LKT_MESSAGE_ARGS_MAX], mpd_idle_flag *watch_mask_ptr,
int priority); int priority);
bool command_addid (volatile sqlite3 *db, struct lkt_win *win, char *args[LKT_MESSAGE_ARGS_MAX], mpd_idle_flag *watch_mask_ptr); bool command_addid (volatile sqlite3 *db, struct lkt_win *win, char *args[LKT_MESSAGE_ARGS_MAX], mpd_idle_flag *watch_mask_ptr);
bool command_multiaddid (volatile sqlite3 *db, struct lkt_win *win, char *args[LKT_MESSAGE_ARGS_MAX], mpd_idle_flag *watch_mask_ptr); bool command_multiaddid(volatile sqlite3 *db, struct lkt_win *win, char *args[LKT_MESSAGE_ARGS_MAX], mpd_idle_flag *watch_mask_ptr);
bool command_del (volatile sqlite3 *db, struct lkt_win *win, char *pos_range, mpd_idle_flag *watch_mask_ptr); bool command_del (volatile sqlite3 *db, struct lkt_win *win, char *pos_range, mpd_idle_flag *watch_mask_ptr);
bool command_delid (volatile sqlite3 *db, struct lkt_win *win, char *id, mpd_idle_flag *watch_mask_ptr); bool command_delid (volatile sqlite3 *db, struct lkt_win *win, char *id, mpd_idle_flag *watch_mask_ptr);
bool command_clear (volatile sqlite3 *db, mpd_idle_flag *watch_mask_ptr); bool command_clear (volatile sqlite3 *db, mpd_idle_flag *watch_mask_ptr);
bool command_crop (volatile sqlite3 *db, mpd_idle_flag *watch_mask_ptr); bool command_crop (volatile sqlite3 *db, mpd_idle_flag *watch_mask_ptr);
bool command_move (volatile sqlite3 *db, char *args[LKT_MESSAGE_ARGS_MAX], mpd_idle_flag *watch_mask_ptr); bool command_move (volatile sqlite3 *db, char *args[LKT_MESSAGE_ARGS_MAX], mpd_idle_flag *watch_mask_ptr);
bool command_shuffle(volatile sqlite3 *db, mpd_idle_flag *watch_mask_ptr); bool command_shuffle (volatile sqlite3 *db, mpd_idle_flag *watch_mask_ptr);
bool command_playid (volatile sqlite3 *db, struct lkt_win *win, char *args[LKT_MESSAGE_ARGS_MAX], mpd_idle_flag *watch_mask_ptr); bool command_playid (volatile sqlite3 *db, struct lkt_win *win, char *args[LKT_MESSAGE_ARGS_MAX], mpd_idle_flag *watch_mask_ptr);
bool command_queue_list(struct lkt_state *srv, size_t c, char *args[LKT_MESSAGE_ARGS_MAX]); bool command_queue_list(struct lkt_state *srv, size_t c, char *args[LKT_MESSAGE_ARGS_MAX]);
......
...@@ -289,7 +289,7 @@ command_multiaddid(volatile sqlite3 *db, struct lkt_win *win, char *args[LKT_MES ...@@ -289,7 +289,7 @@ command_multiaddid(volatile sqlite3 *db, struct lkt_win *win, char *args[LKT_MES
*watch_mask_ptr |= MPD_IDLE_PLAYLIST; *watch_mask_ptr |= MPD_IDLE_PLAYLIST;
STRTOL(id, args[0], endptr, err); STRTOL(id, args[0], endptr, err);
RETURN_IF(err, "STRTOL failed", false); RETURN_IF(err, "STRTOL failed", false);
uri.value = (void *) (size_t) id; uri.value = &id;
return database_queue_add_uri(db, &uri, 1); return database_queue_add_uri(db, &uri, 1);
/* /*
UNUSED(win); UNUSED(win);
......
...@@ -266,7 +266,7 @@ database_queue_add_uri(volatile sqlite3 *db, struct lkt_uri *uri, int priority) ...@@ -266,7 +266,7 @@ database_queue_add_uri(volatile sqlite3 *db, struct lkt_uri *uri, int priority)
return queue_add_with_col_like_str(db, LKT_DATABASE_KARA_ALL, return queue_add_with_col_like_str(db, LKT_DATABASE_KARA_ALL,
uri->value, priority); uri->value, priority);
case uri_id: case uri_id:
return database_queue_add_id(db, *(int *) uri->value, priority); return database_queue_add_id(db, *(size_t *) uri->value, priority);
case uri_type: case uri_type:
return queue_add_with_col_like_str(db, LKT_DATABASE_NAME_KTYPE, return queue_add_with_col_like_str(db, LKT_DATABASE_NAME_KTYPE,
uri->value, priority); uri->value, priority);
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter